diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-05-10 15:40:49 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-05-10 16:52:38 -0400 |
| commit | 0887f4c929ba1354dd1fa78eccd1a7c5151a0ab7 (patch) | |
| tree | b25f359b7baa7f093ac75a998623499357408ddb /src | |
| parent | 0a109b0a4331acbf07d6b3452767b84285edb5e9 (diff) | |
| download | bcfg2-0887f4c929ba1354dd1fa78eccd1a7c5151a0ab7.tar.gz bcfg2-0887f4c929ba1354dd1fa78eccd1a7c5151a0ab7.tar.bz2 bcfg2-0887f4c929ba1354dd1fa78eccd1a7c5151a0ab7.zip | |
Packages: handle URLErrors (e.g., timeouts) when downloading GPG keys better
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py index efbca28cd..d5773de97 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py @@ -9,7 +9,7 @@ import shutil import lxml.etree import Bcfg2.Logger import Bcfg2.Server.Plugin -from Bcfg2.Compat import ConfigParser, urlopen, HTTPError +from Bcfg2.Compat import ConfigParser, urlopen, HTTPError, URLError from Bcfg2.Server.Plugins.Packages.Collection import Collection, \ get_collection_class from Bcfg2.Server.Plugins.Packages.PackagesSources import PackagesSources @@ -459,7 +459,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin, try: open(localfile, 'w').write(urlopen(key).read()) keys.append(key) - except HTTPError: + except (URLError, HTTPError): err = sys.exc_info()[1] self.logger.error("Packages: Error downloading %s: %s" % (key, err)) |