diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-03-21 09:36:34 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-03-21 09:36:34 -0500 |
| commit | 7d22e7fe4bff3c229ed0cb8d3a792e508ba13cce (patch) | |
| tree | 54d1dfc689ef0e4bc0d0c178c45e3fd55901d77a /src/lib/Bcfg2/Client/Tools/YUM.py | |
| parent | 98ef06e6a0426958f476f2835839aea5de3f7bc6 (diff) | |
| parent | 5feb76d97c6b26228dcf521659f434c6b576310c (diff) | |
| download | bcfg2-7d22e7fe4bff3c229ed0cb8d3a792e508ba13cce.tar.gz bcfg2-7d22e7fe4bff3c229ed0cb8d3a792e508ba13cce.tar.bz2 bcfg2-7d22e7fe4bff3c229ed0cb8d3a792e508ba13cce.zip | |
Merge branch 'maint'
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/YUM.py')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/YUM.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/YUM.py b/src/lib/Bcfg2/Client/Tools/YUM.py index 7764a6808..c9fae7fc7 100644 --- a/src/lib/Bcfg2/Client/Tools/YUM.py +++ b/src/lib/Bcfg2/Client/Tools/YUM.py @@ -289,7 +289,7 @@ class YUM(Bcfg2.Client.Tools.PkgTool): def missing_attrs(self, entry): """ Implementing from superclass to check for existence of either - name or group attribute for Package entry in the case of a YUM + name or group attribute for Package entry in the case of a YUM group. """ missing = Bcfg2.Client.Tools.PkgTool.missing_attrs(self, entry) @@ -456,16 +456,16 @@ class YUM(Bcfg2.Client.Tools.PkgTool): group_type = entry.get('choose', 'default') if group_type in ['default', 'optional', 'all']: group_packages += [p - for p, d in + for p, d in group.default_packages.items() if d] if group_type in ['optional', 'all']: group_packages += [p - for p, d in + for p, d in group.optional_packages.items() if d] if len(group_packages) == 0: - self.logger.error("No packages found for group %s" % + self.logger.error("No packages found for group %s" % entry.get("group")) for pkg in group_packages: # create package instances for each package in yum group @@ -478,7 +478,7 @@ class YUM(Bcfg2.Client.Tools.PkgTool): instance.attrib['version'] = newest['version'] instance.attrib['epoch'] = newest['epoch'] instance.attrib['release'] = newest['release'] - except: + except: # pylint: disable=W0702 self.logger.info("Error finding newest package " "for %s" % pkg) @@ -511,7 +511,7 @@ class YUM(Bcfg2.Client.Tools.PkgTool): continue # Ignore duplicate instances else: pkg_cache.append(nevra) - + self.logger.debug("Verifying: %s" % nevra2string(nevra)) # Set some defaults here |