diff options
| author | Jack Neely <jjneely@ncsu.edu> | 2011-03-03 15:41:10 -0500 |
|---|---|---|
| committer | Jack Neely <jjneely@ncsu.edu> | 2011-03-03 15:41:10 -0500 |
| commit | 821a6d5c9244af924146c2e7d4caa0939885a84f (patch) | |
| tree | 14d5d99bc7a60492361bbf600604865e52d361a1 /src/lib/Client/Tools/YUMng.py | |
| parent | 81fce09fb9671c652703c37a5f9b48d020a34307 (diff) | |
| parent | 73a4e8648c501437b3b1f4bd95e9c4023da9b681 (diff) | |
| download | bcfg2-821a6d5c9244af924146c2e7d4caa0939885a84f.tar.gz bcfg2-821a6d5c9244af924146c2e7d4caa0939885a84f.tar.bz2 bcfg2-821a6d5c9244af924146c2e7d4caa0939885a84f.zip | |
Merge branch 'master' into yumng
Diffstat (limited to 'src/lib/Client/Tools/YUMng.py')
| -rw-r--r-- | src/lib/Client/Tools/YUMng.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/Client/Tools/YUMng.py b/src/lib/Client/Tools/YUMng.py index 3b5a62d97..8db1683e4 100644 --- a/src/lib/Client/Tools/YUMng.py +++ b/src/lib/Client/Tools/YUMng.py @@ -358,7 +358,12 @@ class YUMng(Bcfg2.Client.Tools.PkgTool): for po in packages: d = {} for i in ['name', 'epoch', 'version', 'release', 'arch']: - d[i] = getattr(po, i) + if i == 'arch' and getattr(po, i) is None: + d[i] = 'noarch' + elif i == 'epoch' and getattr(po, i) is None: + d[i] = '0' + else: + d[i] = getattr(po, i) self.installed.setdefault(po.name, []).append(d) def VerifyPackage(self, entry, modlist, pinned_version=None): @@ -530,7 +535,7 @@ class YUMng(Bcfg2.Client.Tools.PkgTool): package_fail = True self.logger.debug("It is suggested that you either manage " "these files, revert the changes, or ignore " - "false failures):") + "false failures:") self.logger.debug(" Verify Problems:") for fn, probs in stat['verify'].items(): self.logger.debug(" %s" % fn) |