diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2014-12-28 00:38:40 -0800 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2014-12-30 13:42:26 -0800 |
| commit | 7878398cdf5743d138987d5e6230b2a4d5c095a4 (patch) | |
| tree | 9136cd35568f1a8bd5897c483bc652bb5bd52e7a /gkeys | |
| parent | gkeys/gkey.py: Separate uid string printing for list type output (diff) | |
| download | gentoo-keys-7878398cdf5743d138987d5e6230b2a4d5c095a4.tar.gz gentoo-keys-7878398cdf5743d138987d5e6230b2a4d5c095a4.tar.bz2 gentoo-keys-7878398cdf5743d138987d5e6230b2a4d5c095a4.zip | |
gkeys/actions.py: Add uid search support
Diffstat (limited to 'gkeys')
| -rw-r--r-- | gkeys/gkeys/actions.py | 6 |
1 files 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) |