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 03AF8139085 for ; Sat, 24 Dec 2016 09:13:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9E002340E1; Sat, 24 Dec 2016 09:13:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 B5DE72340E1 for ; Sat, 24 Dec 2016 09:13:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 023E83412F9 for ; Sat, 24 Dec 2016 09:13:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9645E24F3 for ; Sat, 24 Dec 2016 09:13:16 +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: <1482555255.22e10d7e51ca47ad4808f9998c2bf70410557bb3.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: 22e10d7e51ca47ad4808f9998c2bf70410557bb3 X-VCS-Branch: gsoc-2016 Date: Sat, 24 Dec 2016 09:13:16 +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: e177bda6-3b32-41b8-948d-efc02f6f3c92 X-Archives-Hash: 87cb082827f4d1e93457f16d380580cd commit: 22e10d7e51ca47ad4808f9998c2bf70410557bb3 Author: aeroniero33 gmail com> AuthorDate: Sat Jun 18 16:59:58 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sat Dec 24 04:54:15 2016 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=22e10d7e 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 9dc69f0..3070eb3 100644 --- a/gkeys/gkeys/actions.py +++ b/gkeys/gkeys/actions.py @@ -749,7 +749,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) @@ -838,6 +837,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)