diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2012-05-15 08:50:45 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2012-05-15 08:51:49 -0500 |
commit | 3c6f694ff2c062d242c92889af94cac1b0a60a92 (patch) | |
tree | 0381b76c36391d771267a3efd79f7bd1dcf7f508 /src/lib/Server | |
parent | 00ee09dcea30e0afa6d22331d6e2eff624f928d3 (diff) | |
download | bcfg2-3c6f694ff2c062d242c92889af94cac1b0a60a92.tar.gz bcfg2-3c6f694ff2c062d242c92889af94cac1b0a60a92.tar.bz2 bcfg2-3c6f694ff2c062d242c92889af94cac1b0a60a92.zip |
Packages: Fix URLError handling (Reported by dikim33 on IRC)
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Server')
-rw-r--r-- | src/lib/Server/Plugins/Packages/Yum.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/Server/Plugins/Packages/Yum.py b/src/lib/Server/Plugins/Packages/Yum.py index 9ce462c78..d1e97f5b1 100644 --- a/src/lib/Server/Plugins/Packages/Yum.py +++ b/src/lib/Server/Plugins/Packages/Yum.py @@ -11,7 +11,7 @@ import lxml.etree from UserDict import DictMixin from subprocess import Popen, PIPE, STDOUT import Bcfg2.Server.Plugin -from Bcfg2.Bcfg2Py3k import StringIO, cPickle, HTTPError, ConfigParser, file +from Bcfg2.Bcfg2Py3k import StringIO, cPickle, HTTPError, URLError, ConfigParser, file from Bcfg2.Server.Plugins.Packages.Collection import Collection from Bcfg2.Server.Plugins.Packages.Source import SourceInitError, Source, \ fetch_url @@ -564,6 +564,11 @@ class YumSource(Source): except ValueError: self.logger.error("Packages: Bad url string %s" % rmdurl) return [] + except URLError: + err = sys.exc_info()[1] + self.logger.error("Packages: Failed to fetch url %s. %s" % + (rmdurl, err)) + return [] except HTTPError: err = sys.exc_info()[1] self.logger.error("Packages: Failed to fetch url %s. code=%s" % |