diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2010-12-08 21:38:29 -0600 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2010-12-08 21:38:29 -0600 |
| commit | dfcabfcbfc6970c526c80e6f688744966e532c66 (patch) | |
| tree | 7994cc2d40fcb4bbc4e3c3a508d8f4c26a13ce30 /src/lib/Client/Tools/YUMng.py | |
| parent | 19dd6674fe58f3f83a5fa85d2f8ebacf2bfd5e13 (diff) | |
| parent | d08c7ba3ca269639edd8e7696558c74bc06fb487 (diff) | |
| download | bcfg2-dfcabfcbfc6970c526c80e6f688744966e532c66.tar.gz bcfg2-dfcabfcbfc6970c526c80e6f688744966e532c66.tar.bz2 bcfg2-dfcabfcbfc6970c526c80e6f688744966e532c66.zip | |
Merge branch 'master' of git.mcs.anl.gov:bcfg2
Diffstat (limited to 'src/lib/Client/Tools/YUMng.py')
| -rw-r--r-- | src/lib/Client/Tools/YUMng.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/Client/Tools/YUMng.py b/src/lib/Client/Tools/YUMng.py index 9cdcdca40..f0d906717 100644 --- a/src/lib/Client/Tools/YUMng.py +++ b/src/lib/Client/Tools/YUMng.py @@ -210,6 +210,8 @@ class YUMng(Bcfg2.Client.Tools.PkgTool): "version_fail_action", "upgrade").lower() == "upgrade" self.doReinst = CP.get(self.name, "verify_fail_action", "reinstall").lower() == "reinstall" + self.verifyFlags = CP.get(self.name, "verify_flags", + "").lower().replace(' ', ',') self.installOnlyPkgs = self.yb.conf.installonlypkgs if 'gpg-pubkey' not in self.installOnlyPkgs: @@ -225,6 +227,7 @@ class YUMng(Bcfg2.Client.Tools.PkgTool): % self.doReinst) self.logger.debug("YUMng: installOnlyPkgs: %s" \ % str(self.installOnlyPkgs)) + self.logger.debug("YUMng: verify_flags: %s" % self.verifyFlags) def _fixAutoVersion(self, entry): # old style entry; synthesize Instances from current installed @@ -436,6 +439,8 @@ class YUMng(Bcfg2.Client.Tools.PkgTool): stat['verify_fail'] = False stat['pkg'] = entry stat['modlist'] = modlist + verify_flags = inst.get('verify_flags', self.verifyFlags) + verify_flags = verify_flags.lower().replace(' ', ',').split(',') if len(POs) == 0: # Package not installed @@ -505,6 +510,8 @@ class YUMng(Bcfg2.Client.Tools.PkgTool): for p in probs: if p.type == 'missing' and os.path.islink(fn): continue + elif 'no' + p.type in verify_flags: + continue if p.type not in ['missingok', 'ghost']: tmp.append((p.type, p.message)) if tmp != []: |