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 D3EDC139086 for ; Fri, 23 Dec 2016 08:37:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 36421E0E33; Fri, 23 Dec 2016 08:37:34 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 11E98E0E2E for ; Fri, 23 Dec 2016 08:37:29 +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 CBDE734121E 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 8A61B24F2 for ; Fri, 23 Dec 2016 08:37:14 +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: <1482482184.7a71c6c119bd628316685cbe1705be4e5fbf08d1.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: 7a71c6c119bd628316685cbe1705be4e5fbf08d1 X-VCS-Branch: gsoc-2016 Date: Fri, 23 Dec 2016 08:37:14 +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: 757d41ae-215e-4860-a7c3-1a045da11c75 X-Archives-Hash: bd1f8a858b19a21086487d341a39fa40 commit: 7a71c6c119bd628316685cbe1705be4e5fbf08d1 Author: Zac Medico gentoo org> AuthorDate: Thu Oct 27 21:48:07 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Fri Dec 23 08:36:24 2016 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=7a71c6c1 Actions._verify: support --signature path argument If the --signature argument refers to an existing file path, use it. This fixes an issue where signature verification would fail because the sig_path variable referred to None. gkeys/gkeys/actions.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py index 8ed126e..60cfd6d 100644 --- a/gkeys/gkeys/actions.py +++ b/gkeys/gkeys/actions.py @@ -862,6 +862,8 @@ class Actions(ActionBase): break else: signature = None + elif signature is not None and os.path.exists(signature): + sig_path = signature else: filepath = os.path.abspath(filepath) self.logger.debug(