From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4608E1389E2 for ; Wed, 31 Dec 2014 21:34:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87247E08BE; Wed, 31 Dec 2014 21:34:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E9347E08BE for ; Wed, 31 Dec 2014 21:34:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0FB513406CF for ; Wed, 31 Dec 2014 21:34:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2CBAAE981 for ; Wed, 31 Dec 2014 21:34:31 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1419975746.b738dd11378cb4229fa2db3632f815627c2d746b.dolsen@gentoo.org@gentoo> Subject: [gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/ X-VCS-Repository: proj/gentoo-keys X-VCS-Files: gkeys/gkeys/actions.py X-VCS-Directories: gkeys/gkeys/ X-VCS-Committer: dolsen@gentoo.org X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: b738dd11378cb4229fa2db3632f815627c2d746b X-VCS-Branch: master Date: Wed, 31 Dec 2014 21:34:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 52326a97-a892-4ce2-b563-d0a922916725 X-Archives-Hash: 4043ab8f50965aa51e97cf9f98b231ee commit: b738dd11378cb4229fa2db3632f815627c2d746b Author: Brian Dolbec gentoo org> AuthorDate: Sun Dec 28 00:56:25 2014 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Tue Dec 30 21:42:26 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=b738dd11 gkeys/actions.py: Improve verification messages and info --- gkeys/gkeys/actions.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py index b92f3a2..1d3a927 100644 --- a/gkeys/gkeys/actions.py +++ b/gkeys/gkeys/actions.py @@ -680,10 +680,13 @@ class Actions(object): return (False, ['No installed keys found, try installkey action.']) key = handler.seeds.nick_search(args.nick) if not key: - messages.append("Failed to find nick: %s in %s category" - % (args.nick, args.category)) + if args.nick: + messages.append("Failed to find.........: %s in category: %s" + % (args.category, args.nick)) args.category = self.config.get_key('verify-keyring') args.nick = self.config.get_key('verify-nick') + messages.append("Using config defaults..: %s %s" + % (args.category, args.nick)) return self.verify(args, messages) keyrings = self.config.get_key('keyring') @@ -759,14 +762,15 @@ class Actions(object): verified = True messages.extend(["Verification succeeded.: %s" % (filepath), "Key info...............: %s <%s>, %s" - % ( key.name, key.nick, keyid)]) + % ( key.name, key.nick, keyid), + " category, nick.....: %s %s" % (args.category, args.nick)]) else: messages.extend(["Verification failed....: %s" % (filepath), "Key info...............: %s <%s>, %s" % ( key.name, key.nick, keyid)]) has_no_pubkey, s_keyid = results.no_pubkey if has_no_pubkey: - messages.append("Auto-searching for key.: %s" % s_keyid) + messages.append("Auto-searching for key.: 0x%s" % s_keyid) # reset all but keyid and pass thru data args.keyid = s_keyid args.keydir = None