[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/

[Brian Dolbec]

commit:     cd4e3490d0dcf0d3242ba87b3c63f35e642380f9
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 13 16:36:24 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sat Dec 20 16:46:05 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=cd4e3490

gkeys/actions.py: Fix verify() traceback due to args.filename being a list

Create _option_1file() for single filename acceptance
The signature option takes only one sig.

---
 gkeys/actions.py | 6 +++---
 gkeys/base.py    | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gkeys/actions.py b/gkeys/actions.py
index 5b534cb..266db0f 100644
--- a/gkeys/actions.py
+++ b/gkeys/actions.py
@@ -30,19 +30,19 @@ Available_Actions = ['listseed', 'addseed', 'removeseed', 
'moveseed', 'fetchseed
             'refreshkey']
 
 Action_Options = {
-    'listseed': ['nick', 'name', 'keydir', 'fingerprint', 'seedfile', 'file'],
+    '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'],
     'listseedfiles': [],
     'listkey': ['nick', 'name', 'keydir', 'fingerprint', 'category', 
'keyring', 'gpgsearch', 'keyid'],
-    'installkey': ['nick', 'name', 'keydir', 'fingerprint', 'category', 
'keyring', 'seedfile', 'file'],
+    'installkey': ['nick', 'name', 'keydir', 'fingerprint', 'category', 
'keyring', 'seedfile', '1file'],
     'removekey': ['nick', 'name', 'keydir', 'fingerprint', 'category', 
'keyring'],
     'movekey': ['nick', 'name', 'keydir', 'fingerprint', 'category', 
'keyring', 'dest'],
     'installed': ['nick', 'name', 'keydir', 'fingerprint', 'category', 
'keyring'],
     'importkey': ['nick', 'name', 'keydir', 'fingerprint', 'category', 
'keyring'],
-    'verify': ['dest', 'nick', 'name', 'keydir', 'fingerprint', 'category', 
'file', 'signature', 'keyring', 'timestamp'],
+    'verify': ['dest', 'nick', 'name', 'keydir', 'fingerprint', 'category', 
'1file', 'signature', 'keyring', 'timestamp'],
     'checkkey': ['nick', 'name', 'keydir', 'fingerprint', 'category', 
'keyring', 'keyid'],
     'sign': ['nick', 'name', 'keydir', 'fingerprint', 'file', 'keyring'],
     'speccheck': ['nick', 'name', 'keydir', 'fingerprint', 'category', 
'keyring', 'keyid'],

diff --git a/gkeys/base.py b/gkeys/base.py
index d3f8227..0ec8a03 100644
--- a/gkeys/base.py
+++ b/gkeys/base.py
@@ -113,6 +113,11 @@ class CliBase(object):
             help='The path/URL to use for the (signed) file')
 
     @staticmethod
+    def _option_1file(parser=None):
+        parser.add_argument('-F', '--file', dest='filename', default=None,
+            help='The path/URL to use for the (signed) file')
+
+    @staticmethod
     def _option_signature(parser=None):
         parser.add_argument('-s','--signature', dest='signature', default=None,
            help='The path/URL to use for the signature')