1 |
commit: 7878398cdf5743d138987d5e6230b2a4d5c095a4 |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 28 08:38:40 2014 +0000 |
4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 30 21:42:26 2014 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=7878398c |
7 |
|
8 |
gkeys/actions.py: Add uid search support |
9 |
|
10 |
--- |
11 |
gkeys/gkeys/actions.py | 6 +++--- |
12 |
1 file changed, 3 insertions(+), 3 deletions(-) |
13 |
|
14 |
diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py |
15 |
index 03789fa..391d478 100644 |
16 |
--- a/gkeys/gkeys/actions.py |
17 |
+++ b/gkeys/gkeys/actions.py |
18 |
@@ -56,7 +56,7 @@ Action_Options = { |
19 |
'move-key': ['nick', 'name', 'keydir', 'keys', 'fingerprint', 'category', 'keyring', 'dest'], |
20 |
'installed': ['nick', 'name', 'keydir', 'keys', 'fingerprint', 'category', 'keyring'], |
21 |
'import-key': ['nick', 'name', 'keydir', 'keys', 'fingerprint', 'category', 'keyring'], |
22 |
- 'key-search': ['nick', '1name', 'keydir', 'keys', 'fingerprint', 'keyid', 'category', 'exact', 'all'], |
23 |
+ 'key-search': ['nick', '1name', 'keydir', 'keys', 'fingerprint', 'keyid', 'uid', 'category', 'exact', 'all'], |
24 |
'verify': ['dest', 'nick', 'name', 'keydir', 'keys', 'fingerprint', 'category', '1file', 'signature', 'timestamp'], |
25 |
'check-key': ['nick', 'name', 'keydir', 'keys', 'fingerprint', 'category', 'keyring', 'keyid'], |
26 |
'sign': ['nick', 'name', 'keydir', 'fingerprint', 'file', 'keyring'], |
27 |
@@ -881,7 +881,7 @@ class Actions(object): |
28 |
handler = SeedHandler(self.logger, self.config) |
29 |
results = {} |
30 |
search_args = [x for x in |
31 |
- ['nick', 'name', 'keydir', 'fingerprint', 'keyid'] |
32 |
+ ['nick', 'name', 'keydir', 'fingerprint', 'keyid', 'uid'] |
33 |
if getattr(args, x)] |
34 |
if args.category: |
35 |
handler.load_category(args.category) |
36 |
@@ -909,6 +909,6 @@ class Actions(object): |
37 |
for cat in list(keys): |
38 |
msgs.append("Category: %s" % cat) |
39 |
msgs.append(keys[cat]) |
40 |
- del keys, found, cat, result, handler |
41 |
+ del keys, cat, handler |
42 |
return (True, msgs) |