| 1 |
commit: b738dd11378cb4229fa2db3632f815627c2d746b |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 28 00:56:25 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=b738dd11 |
| 7 |
|
| 8 |
gkeys/actions.py: Improve verification messages and info |
| 9 |
|
| 10 |
--- |
| 11 |
gkeys/gkeys/actions.py | 12 ++++++++---- |
| 12 |
1 file changed, 8 insertions(+), 4 deletions(-) |
| 13 |
|
| 14 |
diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py |
| 15 |
index b92f3a2..1d3a927 100644 |
| 16 |
--- a/gkeys/gkeys/actions.py |
| 17 |
+++ b/gkeys/gkeys/actions.py |
| 18 |
@@ -680,10 +680,13 @@ class Actions(object): |
| 19 |
return (False, ['No installed keys found, try installkey action.']) |
| 20 |
key = handler.seeds.nick_search(args.nick) |
| 21 |
if not key: |
| 22 |
- messages.append("Failed to find nick: %s in %s category" |
| 23 |
- % (args.nick, args.category)) |
| 24 |
+ if args.nick: |
| 25 |
+ messages.append("Failed to find.........: %s in category: %s" |
| 26 |
+ % (args.category, args.nick)) |
| 27 |
args.category = self.config.get_key('verify-keyring') |
| 28 |
args.nick = self.config.get_key('verify-nick') |
| 29 |
+ messages.append("Using config defaults..: %s %s" |
| 30 |
+ % (args.category, args.nick)) |
| 31 |
return self.verify(args, messages) |
| 32 |
|
| 33 |
keyrings = self.config.get_key('keyring') |
| 34 |
@@ -759,14 +762,15 @@ class Actions(object): |
| 35 |
verified = True |
| 36 |
messages.extend(["Verification succeeded.: %s" % (filepath), |
| 37 |
"Key info...............: %s <%s>, %s" |
| 38 |
- % ( key.name, key.nick, keyid)]) |
| 39 |
+ % ( key.name, key.nick, keyid), |
| 40 |
+ " category, nick.....: %s %s" % (args.category, args.nick)]) |
| 41 |
else: |
| 42 |
messages.extend(["Verification failed....: %s" % (filepath), |
| 43 |
"Key info...............: %s <%s>, %s" |
| 44 |
% ( key.name, key.nick, keyid)]) |
| 45 |
has_no_pubkey, s_keyid = results.no_pubkey |
| 46 |
if has_no_pubkey: |
| 47 |
- messages.append("Auto-searching for key.: %s" % s_keyid) |
| 48 |
+ messages.append("Auto-searching for key.: 0x%s" % s_keyid) |
| 49 |
# reset all but keyid and pass thru data |
| 50 |
args.keyid = s_keyid |
| 51 |
args.keydir = None |
Archives