diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-04-25 08:46:59 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-04-25 08:46:59 -0400 |
commit | 148239de876a0c8d2fb53fd644ffaabc70540370 (patch) | |
tree | 07210e4910f4405fe23dbdf8ca91411c7f19d71f /src/lib/Bcfg2/Client/Tools/Pacman.py | |
parent | 14c6cfde0761e910b6c3c1924d51cf915ba96e9d (diff) | |
download | bcfg2-148239de876a0c8d2fb53fd644ffaabc70540370.tar.gz bcfg2-148239de876a0c8d2fb53fd644ffaabc70540370.tar.bz2 bcfg2-148239de876a0c8d2fb53fd644ffaabc70540370.zip |
fixed pylint/pep-8 tests
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/Pacman.py')
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/Pacman.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/Pacman.py b/src/lib/Bcfg2/Client/Tools/Pacman.py index a4cfd3315..b931fe028 100644 --- a/src/lib/Bcfg2/Client/Tools/Pacman.py +++ b/src/lib/Bcfg2/Client/Tools/Pacman.py @@ -24,7 +24,6 @@ class Pacman(Bcfg2.Client.Tools.PkgTool): for pkg in self.cmd.run("/usr/bin/pacman -Q").stdout.splitlines(): pkgname = pkg.split(' ')[0].strip() version = pkg.split(' ')[1].strip() - #self.logger.info(" pkgname: %s, version: %s" % (pkgname, version)) self.installed[pkgname] = version def VerifyPackage(self, entry, _): @@ -33,7 +32,7 @@ class Pacman(Bcfg2.Client.Tools.PkgTool): self.logger.info("VerifyPackage: %s : %s" % (entry.get('name'), entry.get('version'))) - if not 'version' in entry.attrib: + if 'version' not in entry.attrib: self.logger.info("Cannot verify unversioned package %s" % entry.attrib['name']) return False @@ -43,10 +42,10 @@ class Pacman(Bcfg2.Client.Tools.PkgTool): return True elif self.installed[entry.attrib['name']] == \ entry.attrib['version']: - #if not self.setup['quick'] and \ - # entry.get('verify', 'true') == 'true': - #FIXME: need to figure out if pacman - # allows you to verify packages + # if (not self.setup['quick'] and + # entry.get('verify', 'true') == 'true'): + # FIXME: need to figure out if pacman + # allows you to verify packages return True else: entry.set('current_version', self.installed[entry.get('name')]) |