diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-03-19 14:13:59 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-03-19 14:13:59 -0400 |
| commit | feef09953d2443d7d4d59cbf81d442380bea02ab (patch) | |
| tree | 3df76e3e187c81cf28d93626302acab60f67d61a /src | |
| parent | a6126199c03919614f9f43afa57d4c19df06ffd6 (diff) | |
| download | bcfg2-feef09953d2443d7d4d59cbf81d442380bea02ab.tar.gz bcfg2-feef09953d2443d7d4d59cbf81d442380bea02ab.tar.bz2 bcfg2-feef09953d2443d7d4d59cbf81d442380bea02ab.zip | |
fixed some pylint errors
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/YUM.py | 12 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Admin/Init.py | 2 |
2 files changed, 7 insertions, 7 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 diff --git a/src/lib/Bcfg2/Server/Admin/Init.py b/src/lib/Bcfg2/Server/Admin/Init.py index 613a76649..4b8d65597 100644 --- a/src/lib/Bcfg2/Server/Admin/Init.py +++ b/src/lib/Bcfg2/Server/Admin/Init.py @@ -13,6 +13,7 @@ import subprocess import Bcfg2.Server.Admin import Bcfg2.Server.Plugin import Bcfg2.Options +import Bcfg2.Server.Plugins.Metadata from Bcfg2.Compat import input # pylint: disable=W0622 # default config file @@ -299,7 +300,6 @@ class Init(Bcfg2.Server.Admin.Mode): """Initialize each plugin-specific portion of the repository.""" for plugin in self.plugins: if plugin == 'Metadata': - import Bcfg2.Server.Plugins.Metadata Bcfg2.Server.Plugins.Metadata.Metadata.init_repo( self.data['repopath'], groups_xml=GROUPS % self.data['os_sel'], |