From 5e58894c77a8560894b9c2091330c3a056746a08 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Sun, 16 Nov 2014 16:37:18 +0100 Subject: Revert "APT: add backwards compatibility for python-apt 0.6" This reverts commit 81cc9e874928ee97283cbf501b4ffd3917f1f476. --- src/lib/Bcfg2/Client/Tools/APT.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/lib/Bcfg2/Client/Tools/APT.py') diff --git a/src/lib/Bcfg2/Client/Tools/APT.py b/src/lib/Bcfg2/Client/Tools/APT.py index fe615b39c..19e506105 100644 --- a/src/lib/Bcfg2/Client/Tools/APT.py +++ b/src/lib/Bcfg2/Client/Tools/APT.py @@ -204,15 +204,8 @@ class APT(Bcfg2.Client.Tools.Tool): self.logger.info('Removing packages:') self.logger.info(pkgnames) for pkg in pkgnames.split(" "): - try: - self.pkg_cache[pkg].mark_delete(purge=True) - except: # pylint: disable=W0702 - self.pkg_cache[pkg].mark_delete() - try: - self.pkg_cache.commit() - except SystemExit: - # thank you python-apt 0.6 - pass + self.pkg_cache[pkg].mark_delete(purge=True) + self.pkg_cache.commit() self.pkg_cache = apt.cache.Cache() self.modified += packages self.extra = self.FindExtra() -- cgit v1.2.3-1-g7c22