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 532D6139085 for ; Sat, 24 Dec 2016 09:13:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8497C2340DF; Sat, 24 Dec 2016 09:13:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 6177D2340DF for ; Sat, 24 Dec 2016 09:13:18 +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 3E0F5341229 for ; Sat, 24 Dec 2016 09:13:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A595324E6 for ; Sat, 24 Dec 2016 09:13:15 +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: <1477604941.cc14fb9350cbfea5d07564bee963d9dc60b94239.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: cc14fb9350cbfea5d07564bee963d9dc60b94239 X-VCS-Branch: gsoc-2016 Date: Sat, 24 Dec 2016 09:13:15 +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: 53a74d27-88db-4ba3-8769-0d448963214e X-Archives-Hash: b728baeb9573258bfa9ef8ae883d23f5 commit: cc14fb9350cbfea5d07564bee963d9dc60b94239 Author: Zac Medico gentoo org> AuthorDate: Thu Oct 27 21:48:07 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Oct 27 21:49:01 2016 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=cc14fb93 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 d51fb3f..b38db19 100644 --- a/gkeys/gkeys/actions.py +++ b/gkeys/gkeys/actions.py @@ -758,6 +758,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( 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 87B19139427 for ; Thu, 27 Oct 2016 21:49:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C269FE0925; Thu, 27 Oct 2016 21:49:39 +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 99557E0925 for ; Thu, 27 Oct 2016 21:49:39 +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 8751F34164F for ; Thu, 27 Oct 2016 21:49:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EA5E5244E for ; Thu, 27 Oct 2016 21:49:35 +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: <1477604941.cc14fb9350cbfea5d07564bee963d9dc60b94239.dolsen@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 X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: cc14fb9350cbfea5d07564bee963d9dc60b94239 X-VCS-Branch: master Date: Thu, 27 Oct 2016 21:49:35 +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: 5871ef3c-d9fc-494b-8452-d5a54eaa087c X-Archives-Hash: b34a7fa57790b4bb2113ceac1ab6a625 Message-ID: <20161027214935.opevzd9YwA3X1TIHJSjWPoqNl2Wslrw2nkjTTItW9Mc@z> commit: cc14fb9350cbfea5d07564bee963d9dc60b94239 Author: Zac Medico gentoo org> AuthorDate: Thu Oct 27 21:48:07 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Oct 27 21:49:01 2016 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=cc14fb93 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 d51fb3f..b38db19 100644 --- a/gkeys/gkeys/actions.py +++ b/gkeys/gkeys/actions.py @@ -758,6 +758,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(