diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2007-01-17 21:51:35 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2007-01-17 21:51:35 +0000 |
| commit | 807ca1c7237149a66cd26fb91500f9dd98e6cbb6 (patch) | |
| tree | 6e45c5ba6b4fd4224624a9c09bb99599df988c7f /src | |
| parent | c2dde075eaa399208dc2b6183bc9517182c265d3 (diff) | |
| download | bcfg2-807ca1c7237149a66cd26fb91500f9dd98e6cbb6.tar.gz bcfg2-807ca1c7237149a66cd26fb91500f9dd98e6cbb6.tar.bz2 bcfg2-807ca1c7237149a66cd26fb91500f9dd98e6cbb6.zip | |
minor comment fix for bcfg2-admin
Add fallback removal mechanism for RPM (to single removal, used when single-pass fails) [From Sumit Roy]
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2691 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Client/Tools/RPM.py | 6 | ||||
| -rwxr-xr-x | src/sbin/bcfg2-admin | 2 |
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 = ''' |