diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2015-02-17 08:55:23 -0600 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2015-02-17 09:05:10 -0600 |
commit | 6491d368d40f3de7d6c49b69b782497151d050a5 (patch) | |
tree | fff48c07ef6ff75b4e27e717cf12e3574f60db35 /src/lib/Bcfg2/Client | |
parent | f4d30301fd4b7dca4375875aedae59e5c3542a34 (diff) | |
download | bcfg2-6491d368d40f3de7d6c49b69b782497151d050a5.tar.gz bcfg2-6491d368d40f3de7d6c49b69b782497151d050a5.tar.bz2 bcfg2-6491d368d40f3de7d6c49b69b782497151d050a5.zip |
Pylint fixes for pylint 0.28
This also pins Pylint to 0.28 or older so that we don't have to do
this again. At some point we should look at upgrading to Pylint 1.x.
Diffstat (limited to 'src/lib/Bcfg2/Client')
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/MacPorts.py | 5 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIXUsers.py | 4 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/Pkgng.py | 9 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/__init__.py | 10 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/__init__.py | 2 |
5 files changed, 16 insertions, 14 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/MacPorts.py b/src/lib/Bcfg2/Client/Tools/MacPorts.py index 1e9847c42..3c824eaff 100644 --- a/src/lib/Bcfg2/Client/Tools/MacPorts.py +++ b/src/lib/Bcfg2/Client/Tools/MacPorts.py @@ -37,8 +37,9 @@ class MacPorts(Bcfg2.Client.Tools.PkgTool): return False if entry.attrib['name'] in self.installed: - if (self.installed[entry.attrib['name']] == entry.attrib['version'] - or entry.attrib['version'] == 'any'): + if (entry.attrib['version'] == 'any' or + self.installed[entry.attrib['name']] == + entry.attrib['version']): # FIXME: We should be able to check this once # http://trac.macports.org/ticket/15709 is implemented return True diff --git a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py index 7200b0fc2..40598541e 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py +++ b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py @@ -160,8 +160,8 @@ class POSIXUsers(Bcfg2.Client.Tools.Tool): """ Get a list of supplmentary groups that the user in the given entry is a member of """ return [g for g in self.existing['POSIXGroup'].values() - if entry.get("name") in g[3] - and self._in_managed_range('POSIXGroup', g[2])] + if entry.get("name") in g[3] and + self._in_managed_range('POSIXGroup', g[2])] def VerifyPOSIXUser(self, entry, _): """ Verify a POSIXUser entry """ diff --git a/src/lib/Bcfg2/Client/Tools/Pkgng.py b/src/lib/Bcfg2/Client/Tools/Pkgng.py index cd70d662d..8989e084d 100644 --- a/src/lib/Bcfg2/Client/Tools/Pkgng.py +++ b/src/lib/Bcfg2/Client/Tools/Pkgng.py @@ -41,8 +41,9 @@ class Pkgng(Bcfg2.Client.Tools.Tool): if (entry.tag == 'Path' and entry.get('name').startswith('/etc/pkg/'))] self.nonexistent = [entry.get('name') for struct in config - for entry in struct if entry.tag == 'Path' - and entry.get('type') == 'nonexistent'] + for entry in struct + if entry.tag == 'Path' and + entry.get('type') == 'nonexistent'] self.actions = {} self.pkg_cache = {} @@ -159,8 +160,8 @@ class Pkgng(Bcfg2.Client.Tools.Tool): else: # version matches if (not Bcfg2.Options.setup.quick and - entry.get('verify', 'true') == 'true' - and checksums): + entry.get('verify', 'true') == 'true' and + checksums): pkgsums = self.VerifyChecksums(entry, modlist) return pkgsums return True diff --git a/src/lib/Bcfg2/Client/Tools/__init__.py b/src/lib/Bcfg2/Client/Tools/__init__.py index 67cdd4d6d..aaadc1428 100644 --- a/src/lib/Bcfg2/Client/Tools/__init__.py +++ b/src/lib/Bcfg2/Client/Tools/__init__.py @@ -573,7 +573,7 @@ class SvcTool(Tool): return self.cmd.run(self.get_svc_command(service, 'stop')) def restart_service(self, service): - """ Restart a service. + """Restart a service. :param service: The service entry to modify :type service: lxml.etree._Element @@ -606,15 +606,15 @@ class SvcTool(Tool): return for entry in bundle: - if (not self.handlesEntry(entry) - or not self._install_allowed(entry)): + if (not self.handlesEntry(entry) or + not self._install_allowed(entry)): continue estatus = entry.get('status') restart = entry.get("restart", "true").lower() if (restart == "false" or estatus == 'ignore' or - (restart == "interactive" and - not Bcfg2.Options.setup.interactive)): + (restart == "interactive" and + not Bcfg2.Options.setup.interactive)): continue success = False diff --git a/src/lib/Bcfg2/Client/__init__.py b/src/lib/Bcfg2/Client/__init__.py index 359d7ac73..1240ad74a 100644 --- a/src/lib/Bcfg2/Client/__init__.py +++ b/src/lib/Bcfg2/Client/__init__.py @@ -874,7 +874,7 @@ class Client(object): else: self.logger.info("%s:%s" % (entry.tag, entry.get('name'))) - self.logger.info('Total managed entries: %d' % + self.logger.info('Total managed entries: %d' % len(list(self.states.values()))) self.logger.info('Unmanaged entries: %d' % len(self.extra)) if phase == 'final' and Bcfg2.Options.setup.show_extra: |