diff --git a/lib/portage/sync/syncbase.py b/lib/portage/sync/syncbase.py index c3a07da7d7..c187c59145 100644 --- a/lib/portage/sync/syncbase.py +++ b/lib/portage/sync/syncbase.py @@ -330,6 +330,7 @@ def noisy_refresh_keys(): def _get_openpgp_env(self, openpgp_key_path=None, debug=False): if gemato is not None: + timeout = 15 # Override global proxy setting with one provided in emerge configuration if "http_proxy" in self.spawn_kwargs["env"]: proxy = self.spawn_kwargs["env"]["http_proxy"] @@ -337,14 +338,15 @@ def _get_openpgp_env(self, openpgp_key_path=None, debug=False): proxy = self.spawn_kwargs["env"]["https_proxy"] else: proxy = None + timeout = 5 if openpgp_key_path: openpgp_env = gemato.openpgp.OpenPGPEnvironment( - proxy=proxy, debug=debug + proxy=proxy, debug=debug, timeout=timeout ) else: openpgp_env = gemato.openpgp.OpenPGPSystemEnvironment( - proxy=proxy, debug=debug + proxy=proxy, debug=debug, timeout=timeout ) return openpgp_env