commit:     7878398cdf5743d138987d5e6230b2a4d5c095a4
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 28 08:38:40 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Dec 30 21:42:26 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=7878398c

gkeys/actions.py: Add uid search support

---
 gkeys/gkeys/actions.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index 03789fa..391d478 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -56,7 +56,7 @@ Action_Options = {
     'move-key': ['nick', 'name', 'keydir', 'keys', 'fingerprint', 'category', 
'keyring', 'dest'],
     'installed': ['nick', 'name', 'keydir', 'keys', 'fingerprint', 'category', 
'keyring'],
     'import-key': ['nick', 'name', 'keydir', 'keys', 'fingerprint', 
'category', 'keyring'],
-    'key-search': ['nick', '1name', 'keydir', 'keys', 'fingerprint', 'keyid', 
'category', 'exact', 'all'],
+    'key-search': ['nick', '1name', 'keydir', 'keys', 'fingerprint', 'keyid', 
'uid', 'category', 'exact', 'all'],
     'verify': ['dest', 'nick', 'name', 'keydir', 'keys', 'fingerprint', 
'category', '1file', 'signature', 'timestamp'],
     'check-key': ['nick', 'name', 'keydir', 'keys', 'fingerprint', 'category', 
'keyring', 'keyid'],
     'sign': ['nick', 'name', 'keydir', 'fingerprint', 'file', 'keyring'],
@@ -881,7 +881,7 @@ class Actions(object):
         handler = SeedHandler(self.logger, self.config)
         results = {}
         search_args = [x for x in
-            ['nick', 'name', 'keydir', 'fingerprint', 'keyid']
+            ['nick', 'name', 'keydir', 'fingerprint', 'keyid', 'uid']
             if getattr(args, x)]
         if args.category:
             handler.load_category(args.category)
@@ -909,6 +909,6 @@ class Actions(object):
         for cat in list(keys):
             msgs.append("Category: %s" % cat)
             msgs.append(keys[cat])
-        del keys, found, cat, result, handler
+        del keys, cat, handler
         return (True, msgs)
 

Reply via email to