summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2011-02-24 10:52:21 -0500
committerJack Neely <jjneely@ncsu.edu>2011-03-17 14:37:12 -0400
commitaff1b223d970e2f4b3f9f78ef60933a27c0d6ed1 (patch)
treee4bb6b0c53899a7079e74aeb9d240986e1aa2b3c
parentb90963b68dcf46031f0aed4280218c2aea5cdb68 (diff)
downloadbcfg2-aff1b223d970e2f4b3f9f78ef60933a27c0d6ed1.tar.gz
bcfg2-aff1b223d970e2f4b3f9f78ef60933a27c0d6ed1.tar.bz2
bcfg2-aff1b223d970e2f4b3f9f78ef60933a27c0d6ed1.zip
YUMng: Fix handling of gpg-pubkey packages by yum 3.2.20 on SLES
-rw-r--r--src/lib/Client/Tools/YUMng.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/Client/Tools/YUMng.py b/src/lib/Client/Tools/YUMng.py
index 12aad2c0e..0fd8de034 100644
--- a/src/lib/Client/Tools/YUMng.py
+++ b/src/lib/Client/Tools/YUMng.py
@@ -350,7 +350,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):