summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2014-11-06 18:37:41 -0600
committerSol Jerome <sol.jerome@gmail.com>2014-11-06 18:37:41 -0600
commit6be5de9e8ed7e29d3763b36f870a2f470917f76d (patch)
tree4a72d6ecc63c42271d093d4c88b20b5dab9c6d5d
parent14b808b5a9adf46857bdd971afe8e6717898e721 (diff)
parent4e8bc5c002a54aaee1368330be6374c2e9deda59 (diff)
downloadbcfg2-6be5de9e8ed7e29d3763b36f870a2f470917f76d.tar.gz
bcfg2-6be5de9e8ed7e29d3763b36f870a2f470917f76d.tar.bz2
bcfg2-6be5de9e8ed7e29d3763b36f870a2f470917f76d.zip
Merge branch 'handle-apt-update-exceptions' of https://github.com/AlexanderS/bcfg2 into maint
-rw-r--r--src/lib/Bcfg2/Client/Tools/APT.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/APT.py b/src/lib/Bcfg2/Client/Tools/APT.py
index 0a8fe387f..d736b12ea 100644
--- a/src/lib/Bcfg2/Client/Tools/APT.py
+++ b/src/lib/Bcfg2/Client/Tools/APT.py
@@ -68,7 +68,11 @@ class APT(Bcfg2.Client.Tools.Tool):
e = sys.exc_info()[1]
self.logger.info("Failed to initialize APT cache: %s" % e)
raise Bcfg2.Client.Tools.ToolInstantiationError
- self.pkg_cache.update()
+ try:
+ self.pkg_cache.update()
+ except FetchFailedException:
+ e = sys.exc_info()[1]
+ self.logger.info("Failed to update APT cache: %s" % e)
self.pkg_cache = apt.cache.Cache()
if 'req_reinstall_pkgs' in dir(self.pkg_cache):
self._newapi = True