diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2007-06-06 23:49:35 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2007-06-06 23:49:35 +0000 |
| commit | 9a44c84bd15c04723226f67f343bd5c4682de9f2 (patch) | |
| tree | 439600b8140b784ed4961e89794c9deb40578c55 /src | |
| parent | 7e92e303d273663ef3f4d49ce7dd43d7d9bf217e (diff) | |
| download | bcfg2-9a44c84bd15c04723226f67f343bd5c4682de9f2.tar.gz bcfg2-9a44c84bd15c04723226f67f343bd5c4682de9f2.tar.bz2 bcfg2-9a44c84bd15c04723226f67f343bd5c4682de9f2.zip | |
more driver updates from mbrady
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3261 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Client/Tools/RPMng.py | 4 | ||||
| -rw-r--r-- | src/lib/Client/Tools/YUMng.py | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/Client/Tools/RPMng.py b/src/lib/Client/Tools/RPMng.py index c978d7060..d36a10737 100644 --- a/src/lib/Client/Tools/RPMng.py +++ b/src/lib/Client/Tools/RPMng.py @@ -177,7 +177,7 @@ class RPMng(Bcfg2.Client.Tools.PkgTool): self.instance_status[inst]['installed'] = True if self.pkg_verify == 'true' and \ - inst.get('pkg_checks', 'true') == 'true': + inst.get('pkg_verify', 'true') == 'true': flags = inst.get('verify_flags', '').split(',') if pkg.get('gpgkeyid', '')[-8:] not in self.gpg_keyids and \ entry.get('name') != 'gpg-pubkey': @@ -232,7 +232,7 @@ class RPMng(Bcfg2.Client.Tools.PkgTool): self.instance_status[inst]['installed'] = True if self.pkg_verify == 'true' and \ - inst.get('pkg_checks', 'true') == 'true': + inst.get('pkg_verify', 'true') == 'true': flags = inst.get('verify_flags', '').split(',') if pkg.get('gpgkeyid', '')[-8:] not in self.gpg_keyids: flags += ['nosignature', 'nodigest'] diff --git a/src/lib/Client/Tools/YUMng.py b/src/lib/Client/Tools/YUMng.py index 37e70b378..c6edac6b8 100644 --- a/src/lib/Client/Tools/YUMng.py +++ b/src/lib/Client/Tools/YUMng.py @@ -332,8 +332,11 @@ class YUMng(Bcfg2.Client.Tools.RPMng.RPMng): pkg_arg = pkg_arg + '.' + inst.get('arch') erase_args.append(pkg_arg) else: + pkgspec = { 'name':pkg.get('name'), + 'version':inst.get('version'), + 'release':inst.get('release')} self.logger.info("WARNING: gpg-pubkey package not in configuration %s %s"\ - % (pkg.get('name'), self.str_evra(pkg))) + % (pkgspec.get('name'), self.str_evra(pkgspec))) self.logger.info(" This package will be deleted in a future version of the RPMng driver.") cmdrc, output = self.cmd.run(pkgtool % " ".join(erase_args)) |