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 7B7F3138334 for ; Tue, 10 Jul 2018 04:28:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A00DAE0870; Tue, 10 Jul 2018 04:28:21 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 629E3E0870 for ; Tue, 10 Jul 2018 04:28:21 +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 32C18335C9E for ; Tue, 10 Jul 2018 04:28:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A0F2635C for ; Tue, 10 Jul 2018 04:28:17 +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: <1531196754.89b85e47d7ac0d5f36b182c36eb1e72db7187b36.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/sync/modules/git/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/sync/modules/git/git.py X-VCS-Directories: pym/portage/sync/modules/git/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 89b85e47d7ac0d5f36b182c36eb1e72db7187b36 X-VCS-Branch: master Date: Tue, 10 Jul 2018 04:28:17 +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: 45138e04-e9cc-4b6e-af6d-6d05fe8884b3 X-Archives-Hash: 723508bfec3c0af3aea0056d52f182a9 commit: 89b85e47d7ac0d5f36b182c36eb1e72db7187b36 Author: Zac Medico gentoo org> AuthorDate: Sun Jul 8 20:29:40 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Jul 10 04:25:54 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=89b85e47 GitSync: add key refresh retry (bug 660732) Bug: https://bugs.gentoo.org/660732 pym/portage/sync/modules/git/git.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pym/portage/sync/modules/git/git.py b/pym/portage/sync/modules/git/git.py index 97c4c1de6..68f8bd1fb 100644 --- a/pym/portage/sync/modules/git/git.py +++ b/pym/portage/sync/modules/git/git.py @@ -8,6 +8,7 @@ import subprocess import portage from portage import os from portage.util import writemsg_level, shlex_split +from portage.util.futures import asyncio from portage.output import create_color_func, EOutput good = create_color_func("GOOD") bad = create_color_func("BAD") @@ -197,10 +198,8 @@ class GitSync(NewBase): out.einfo('Using keys from %s' % (self.repo.sync_openpgp_key_path,)) with io.open(self.repo.sync_openpgp_key_path, 'rb') as f: openpgp_env.import_key(f) - out.ebegin('Refreshing keys from keyserver') - openpgp_env.refresh_keys() - out.eend(0) - except GematoException as e: + self._refresh_keys(openpgp_env) + except (GematoException, asyncio.TimeoutError) as e: writemsg_level("!!! Verification impossible due to keyring problem:\n%s\n" % (e,), level=logging.ERROR, noiselevel=-1)