diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2018-07-08 13:29:40 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2018-07-09 21:25:54 -0700 |
| commit | 89b85e47d7ac0d5f36b182c36eb1e72db7187b36 (patch) | |
| tree | 29a40fcf8ed9e1c486f0ea5d6106b342ed4df8a7 /pym | |
| parent | SyncBase: split out _refresh_keys method (bug 660732) (diff) | |
| download | portage-89b85e47d7ac0d5f36b182c36eb1e72db7187b36.tar.gz portage-89b85e47d7ac0d5f36b182c36eb1e72db7187b36.tar.bz2 portage-89b85e47d7ac0d5f36b182c36eb1e72db7187b36.zip | |
GitSync: add key refresh retry (bug 660732)
Bug: https://bugs.gentoo.org/660732
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/sync/modules/git/git.py | 7 |
1 files 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) |