From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 11E83139085 for ; Fri, 23 Dec 2016 08:37:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7BA3AE0DEA; Fri, 23 Dec 2016 08:37:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5BECBE0DE5 for ; Fri, 23 Dec 2016 08:37:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 91D44340FC1 for ; Fri, 23 Dec 2016 08:37:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F16A924EA for ; Fri, 23 Dec 2016 08:37:13 +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: <1482478602.a537deef9c974b52cec402fc7f0f7cc9401814a2.dolsen@gentoo> Subject: [gentoo-commits] proj/gentoo-keys:gsoc-2016 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 X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: a537deef9c974b52cec402fc7f0f7cc9401814a2 X-VCS-Branch: gsoc-2016 Date: Fri, 23 Dec 2016 08:37:13 +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: 6dc745d1-7e8a-4133-965d-c06304820582 X-Archives-Hash: 66a621d1c25e75002bed7a952b953dbf commit: a537deef9c974b52cec402fc7f0f7cc9401814a2 Author: aeroniero33 gmail com> AuthorDate: Sat Jun 18 16:59:58 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Fri Dec 23 07:36:42 2016 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=a537deef Fixed a bug in the verify function gkeys/gkeys/actions.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py index 849568d..6ce4199 100644 --- a/gkeys/gkeys/actions.py +++ b/gkeys/gkeys/actions.py @@ -746,7 +746,6 @@ class Actions(ActionBase): messages.append(_unicode("Using config defaults..: %s %s") % (args.category, args.nick)) return self.verify(args, messages) - return self._verify(args, key, messages) @@ -833,6 +832,8 @@ class Actions(ActionBase): break else: sig_path = None + elif signature: + sig_path = os.path.abspath(signature) self.logger.info("Verifying file...") verified = False results = self.gpg.verify_file(key, sig_path, filepath)