summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/lib/Client/Tools/APT.py2
-rw-r--r--src/lib/Client/Tools/RPM.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Client/Tools/APT.py b/src/lib/Client/Tools/APT.py
index 513288b4d..6d8e38a7a 100644
--- a/src/lib/Client/Tools/APT.py
+++ b/src/lib/Client/Tools/APT.py
@@ -67,7 +67,7 @@ class APT(Bcfg2.Client.Tools.PkgTool):
self.logger.info('Removing packages:')
self.logger.info(packages)
self.cmd.run("apt-get remove -y --force-yes %s" % \
- " ".join(packages))
+ " ".join([pkg.get('name') for pkg in packages]))
self.RefreshPackages()
self.extra = self.FindExtraPackages()
diff --git a/src/lib/Client/Tools/RPM.py b/src/lib/Client/Tools/RPM.py
index 3a3d1b7e4..efdd05a90 100644
--- a/src/lib/Client/Tools/RPM.py
+++ b/src/lib/Client/Tools/RPM.py
@@ -74,9 +74,9 @@ class RPM(Bcfg2.Client.Tools.PkgTool):
return False
return True
- def RemovePackages(self, entries):
+ def RemovePackages(self, packages):
'''Remove specified entries'''
- pkgnames = " ".join([entry[2] for entry in entries])
+ pkgnames = [pkg.get('name') for pkg in packages]
if len(pkgnames) > 0:
self.logger.info("Removing packages: %s" % pkgnames)
self.cmd.run("rpm --quiet -e --allmatches %s" % " ".join(pkgnames))