commit: ec872348954a8850c071d0a56d502731389b03ea
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 23 23:52:48 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Dec 23 23:52:48 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=ec872348
gkeys: Use -C, --category exclusivley for consistency
No longer use -S, --seedfile for seed file operations.
With the new dynamic category handling, it was redundant.
---
gkeys/gkeys/actions.py | 20 ++++++++++----------
gkeys/gkeys/base.py | 2 --
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index 094ea71..172b43e 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -31,14 +31,14 @@ Available_Actions = ['listcats', 'listseed', 'addseed',
'removeseed', 'moveseed'
Action_Options = {
'listcats': [],
- 'listseed': ['nick', 'name', 'keydir', 'fingerprint', 'seedfile', '1file'],
- 'addseed': ['nick', 'name', 'keydir', 'fingerprint', 'seedfile'],
- 'removeseed': ['nick', 'name', 'keydir', 'fingerprint', 'seedfile'],
- 'moveseed': ['nick', 'name', 'keydir', 'fingerprint', 'seedfile', 'dest'],
- 'fetchseed': ['nick', 'name', 'keydir', 'fingerprint', 'seedfile'],
+ 'listseed': ['nick', 'name', 'keydir', 'fingerprint', 'category', '1file'],
+ 'addseed': ['nick', 'name', 'keydir', 'fingerprint', 'category'],
+ 'removeseed': ['nick', 'name', 'keydir', 'fingerprint', 'category'],
+ 'moveseed': ['nick', 'name', 'keydir', 'fingerprint', 'category', 'dest'],
+ 'fetchseed': ['nick', 'name', 'keydir', 'fingerprint', 'category'],
'listseedfiles': [],
'listkey': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'keyring', 'gpgsearch', 'keyid'],
- 'installkey': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'keyring', 'seedfile', '1file'],
+ 'installkey': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'keyring', '1file'],
'removekey': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'keyring'],
'movekey': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'keyring', 'dest'],
'installed': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'keyring'],
@@ -68,7 +68,7 @@ class Actions(object):
self.logger.debug("ACTIONS: listseed; kwargs: %s" % str(kwargs))
if not self.seeds:
try:
- self.seeds = handler.load_seeds(args.seedfile, args.nick)
+ self.seeds = handler.load_seeds(args.category, args.nick)
except ValueError:
return (False, ["Failed to load seed file. Consider fetching
seedfiles."])
if self.seeds:
@@ -82,7 +82,7 @@ class Actions(object):
'''Download the selected seed file(s)'''
self.logger.debug("ACTIONS: fetchseed; args: %s" % str(args))
handler = SeedHandler(self.logger, self.config)
- success, messages = handler.fetch_seeds(args.seedfile, args,
self.verify)
+ success, messages = handler.fetch_seeds(args.category, args,
self.verify)
messages.append("")
messages.append("Fetch operation completed")
@@ -273,7 +273,7 @@ class Actions(object):
# get confirmation
# fill in code here
keyring = self.config.get_key('keyring')
- catdir = os.path.join(keyring, args.seedfile)
+ catdir = os.path.join(keyring, args.category)
self.logger.debug("ACTIONS: installkey; catdir = %s" % catdir)
self.gpg = GkeysGPG(self.config, catdir)
results = {}
@@ -696,7 +696,7 @@ class Actions(object):
def listcats(self, args):
'''List seed file definitions found in the config'''
seeds = list(self.config.get_key('seeds'))
- return (True, {"Categories/Seedfiles defined: %s\n"
+ return (True, {"Categories defined: %s\n"
% (", ".join(seeds)): True})
diff --git a/gkeys/gkeys/base.py b/gkeys/gkeys/base.py
index af66ff3..cadafc7 100644
--- a/gkeys/gkeys/base.py
+++ b/gkeys/gkeys/base.py
@@ -221,8 +221,6 @@ class CliBase(object):
cat = None
if 'category' in args:
cat = args.category
- elif 'seedfile' in args:
- cat = args.seedfile
if not self._check_category(cat):
return False
