1 |
Bug: https://bugs.gentoo.org/660732 |
2 |
--- |
3 |
pym/portage/sync/modules/git/git.py | 7 +++---- |
4 |
1 file changed, 3 insertions(+), 4 deletions(-) |
5 |
|
6 |
diff --git a/pym/portage/sync/modules/git/git.py b/pym/portage/sync/modules/git/git.py |
7 |
index 97c4c1de67..68f8bd1fb9 100644 |
8 |
--- a/pym/portage/sync/modules/git/git.py |
9 |
+++ b/pym/portage/sync/modules/git/git.py |
10 |
@@ -8,6 +8,7 @@ import subprocess |
11 |
import portage |
12 |
from portage import os |
13 |
from portage.util import writemsg_level, shlex_split |
14 |
+from portage.util.futures import asyncio |
15 |
from portage.output import create_color_func, EOutput |
16 |
good = create_color_func("GOOD") |
17 |
bad = create_color_func("BAD") |
18 |
@@ -197,10 +198,8 @@ class GitSync(NewBase): |
19 |
out.einfo('Using keys from %s' % (self.repo.sync_openpgp_key_path,)) |
20 |
with io.open(self.repo.sync_openpgp_key_path, 'rb') as f: |
21 |
openpgp_env.import_key(f) |
22 |
- out.ebegin('Refreshing keys from keyserver') |
23 |
- openpgp_env.refresh_keys() |
24 |
- out.eend(0) |
25 |
- except GematoException as e: |
26 |
+ self._refresh_keys(openpgp_env) |
27 |
+ except (GematoException, asyncio.TimeoutError) as e: |
28 |
writemsg_level("!!! Verification impossible due to keyring problem:\n%s\n" |
29 |
% (e,), |
30 |
level=logging.ERROR, noiselevel=-1) |
31 |
-- |
32 |
2.13.6 |