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 09D56138334 for ; Mon, 23 Jul 2018 18:52:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25817E0871; Mon, 23 Jul 2018 18:52:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EBE68E0871 for ; Mon, 23 Jul 2018 18:52:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 319FE335DC4 for ; Mon, 23 Jul 2018 18:52:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3D2DA371 for ; Mon, 23 Jul 2018 18:52:42 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1532371862.dc1ba7729c42cbe738ae7ec34e2f13f79c48d41c.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/sync/modules/git/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/sync/modules/git/git.py X-VCS-Directories: lib/portage/sync/modules/git/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: dc1ba7729c42cbe738ae7ec34e2f13f79c48d41c X-VCS-Branch: master Date: Mon, 23 Jul 2018 18:52:42 +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: 5140b800-362b-4a12-bf17-777127f848bb X-Archives-Hash: fec4251ab0d0a9fe5d75fc0a5de25ce1 commit: dc1ba7729c42cbe738ae7ec34e2f13f79c48d41c Author: Zac Medico gentoo org> AuthorDate: Mon Jul 23 18:46:08 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Jul 23 18:51:02 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=dc1ba772 git: fix key refresh failure to trigger abort (bug 661906) Fix the verify_head method to appropriately return a bool value instead of a tuple. Fixes: d30191b887bb ("git: Support running the verification against sync-openpgp-key-path") Bug: https://bugs.gentoo.org/661906 lib/portage/sync/modules/git/git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/portage/sync/modules/git/git.py b/lib/portage/sync/modules/git/git.py index 2fb82c600..33f71b510 100644 --- a/lib/portage/sync/modules/git/git.py +++ b/lib/portage/sync/modules/git/git.py @@ -227,7 +227,7 @@ class GitSync(NewBase): writemsg_level("!!! Verification impossible due to keyring problem:\n%s\n" % (e,), level=logging.ERROR, noiselevel=-1) - return (1, False) + False env = os.environ.copy() env['GNUPGHOME'] = openpgp_env.home