diff options
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Packages/Yum.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Yum.py | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py index 2f197443c..27523f2ab 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py @@ -429,17 +429,20 @@ class YumCollection(Collection): def packages_to_entry(self, pkglist, entry): def _get_entry_attrs(pkgtup): - attrs = dict(arch=pkgtup[1], - epoch=pkgtup[2], - version=pkgtup[3], - release=pkgtup[4]) - if attrs['version'] is None: - attrs['version'] = self.setup.cfp.get("packages", - "version", - default="auto"), - for k in attrs.keys()[:]: - if attrs[k] is None: - del attrs[k] + attrs = dict(version=self.setup.cfp.get("packages", + "version", + default="auto")) + if attrs['version'] == 'any': + return attrs + + if pkgtup[1]: + attrs['arch'] = pkgtup[1] + if pkgtup[2]: + attrs['epoch'] = pkgtup[2] + if pkgtup[3]: + attrs['version'] = pkgtup[3] + if pkgtup[4]: + attrs['release'] = pkgtup[4] return attrs packages = dict() |