| 1 |
commit: 89b85e47d7ac0d5f36b182c36eb1e72db7187b36 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 8 20:29:40 2018 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 10 04:25:54 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=89b85e47 |
| 7 |
|
| 8 |
GitSync: add key refresh retry (bug 660732) |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/660732 |
| 11 |
|
| 12 |
pym/portage/sync/modules/git/git.py | 7 +++---- |
| 13 |
1 file changed, 3 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/pym/portage/sync/modules/git/git.py b/pym/portage/sync/modules/git/git.py |
| 16 |
index 97c4c1de6..68f8bd1fb 100644 |
| 17 |
--- a/pym/portage/sync/modules/git/git.py |
| 18 |
+++ b/pym/portage/sync/modules/git/git.py |
| 19 |
@@ -8,6 +8,7 @@ import subprocess |
| 20 |
import portage |
| 21 |
from portage import os |
| 22 |
from portage.util import writemsg_level, shlex_split |
| 23 |
+from portage.util.futures import asyncio |
| 24 |
from portage.output import create_color_func, EOutput |
| 25 |
good = create_color_func("GOOD") |
| 26 |
bad = create_color_func("BAD") |
| 27 |
@@ -197,10 +198,8 @@ class GitSync(NewBase): |
| 28 |
out.einfo('Using keys from %s' % (self.repo.sync_openpgp_key_path,)) |
| 29 |
with io.open(self.repo.sync_openpgp_key_path, 'rb') as f: |
| 30 |
openpgp_env.import_key(f) |
| 31 |
- out.ebegin('Refreshing keys from keyserver') |
| 32 |
- openpgp_env.refresh_keys() |
| 33 |
- out.eend(0) |
| 34 |
- except GematoException as e: |
| 35 |
+ self._refresh_keys(openpgp_env) |
| 36 |
+ except (GematoException, asyncio.TimeoutError) as e: |
| 37 |
writemsg_level("!!! Verification impossible due to keyring problem:\n%s\n" |
| 38 |
% (e,), |
| 39 |
level=logging.ERROR, noiselevel=-1) |
Archives