summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Client/Tools/Pkgng.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2015-02-17 08:55:23 -0600
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2015-02-17 09:05:10 -0600
commit6491d368d40f3de7d6c49b69b782497151d050a5 (patch)
treefff48c07ef6ff75b4e27e717cf12e3574f60db35 /src/lib/Bcfg2/Client/Tools/Pkgng.py
parentf4d30301fd4b7dca4375875aedae59e5c3542a34 (diff)
downloadbcfg2-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/Tools/Pkgng.py')
-rw-r--r--src/lib/Bcfg2/Client/Tools/Pkgng.py9
1 files changed, 5 insertions, 4 deletions
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