summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/lib/Client/Tools/RPM.py6
-rwxr-xr-xsrc/sbin/bcfg2-admin2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/Client/Tools/RPM.py b/src/lib/Client/Tools/RPM.py
index de3f7ca8c..36402c79d 100644
--- a/src/lib/Client/Tools/RPM.py
+++ b/src/lib/Client/Tools/RPM.py
@@ -98,5 +98,11 @@ class RPM(Bcfg2.Client.Tools.PkgTool):
self.logger.info("Removing packages: %s" % pkgnames)
if self.cmd.run("rpm --quiet -e --allmatches %s" % " ".join(pkgnames))[0] == 0:
self.modified += packages
+ else:
+ for pkg in packages:
+ if self.cmd.run("rpm --quiet -e --allmatches %s" % \
+ pkg.get('name'))[0] == 0:
+ self.modified += pkg
+
self.RefreshPackages()
self.extra = self.FindExtraPackages()
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin
index adeadc317..011bf8688 100755
--- a/src/sbin/bcfg2-admin
+++ b/src/sbin/bcfg2-admin
@@ -14,7 +14,7 @@ bcfg2-admin [options]
init - initialize the bcfg2 repository( this is interactive; only run once )
mineentry <client> <entry type> <entry name> - mine statistics for entry information
minestruct <client> - mine statistics for extra entries
-viz [-h] [-b] [-m] [-o output.png] [-r'
+viz [-h] [-b] [-m] [-o output.png] [-r]
'''
config = '''