From 81cc9e874928ee97283cbf501b4ffd3917f1f476 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Tue, 21 Jul 2009 18:35:36 +0000 Subject: APT: add backwards compatibility for python-apt 0.6 git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5375 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Client/Tools/APT.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/Client/Tools/APT.py b/src/lib/Client/Tools/APT.py index 2148a3207..074b9f1ca 100644 --- a/src/lib/Client/Tools/APT.py +++ b/src/lib/Client/Tools/APT.py @@ -132,8 +132,15 @@ class APT(Bcfg2.Client.Tools.Tool): self.logger.info('Removing packages:') self.logger.info(pkgnames) for pkg in pkgnames.split(" "): - self.pkg_cache[pkg].markDelete(purge=True) - self.pkg_cache.commit() + try: + self.pkg_cache[pkg].markDelete(purge=True) + except: + self.pkg_cache[pkg].markDelete() + try: + self.pkg_cache.commit() + except SystemExit: + # thank you python-apt 0.6 + pass self.pkg_cache = apt.cache.Cache() self.modified += packages self.extra = self.FindExtra() -- cgit v1.2.3-1-g7c22