diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2014-11-16 16:37:18 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2014-11-16 17:37:52 +0100 |
| commit | 5e58894c77a8560894b9c2091330c3a056746a08 (patch) | |
| tree | 12b2471615453e5792ef8caea3de83d7fad05277 | |
| parent | ee4111fcc7fa66c61bc20a3f7901d0e1736e1ef6 (diff) | |
| download | bcfg2-5e58894c77a8560894b9c2091330c3a056746a08.tar.gz bcfg2-5e58894c77a8560894b9c2091330c3a056746a08.tar.bz2 bcfg2-5e58894c77a8560894b9c2091330c3a056746a08.zip | |
Revert "APT: add backwards compatibility for python-apt 0.6"
This reverts commit 81cc9e874928ee97283cbf501b4ffd3917f1f476.
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/APT.py | 11 |
1 files changed, 2 insertions, 9 deletions
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() |