[gentoo-commits] proj/portage:master commit in: lib/portage/sync/modules/git/

[Zac Medico]

commit:     dc1ba7729c42cbe738ae7ec34e2f13f79c48d41c
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 23 18:46:08 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> 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