From aeddf10f2e129c70b182e91b727ccc8028e3fd45 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 26 Sep 2012 09:48:58 -0400 Subject: made full pylint checks the default, expanded pylint coverage to lots of tools --- src/lib/Bcfg2/Client/Tools/Encap.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/lib/Bcfg2/Client/Tools/Encap.py') diff --git a/src/lib/Bcfg2/Client/Tools/Encap.py b/src/lib/Bcfg2/Client/Tools/Encap.py index fa09c3ec7..b5057786f 100644 --- a/src/lib/Bcfg2/Client/Tools/Encap.py +++ b/src/lib/Bcfg2/Client/Tools/Encap.py @@ -4,6 +4,7 @@ import glob import re import Bcfg2.Client.Tools + class Encap(Bcfg2.Client.Tools.PkgTool): """Support for Encap packages.""" name = 'Encap' @@ -14,9 +15,6 @@ class Encap(Bcfg2.Client.Tools.PkgTool): pkgtool = ("/usr/local/bin/epkg -l -f -q %s", ("%s", ["url"])) splitter = re.compile('.*/(?P[\w-]+)\-(?P[\w\.+-]+)') -# If you define self.pkgtool and self.pkgname it will [use] the Pkgtool.Install -# method will do the installation stuff for you - def RefreshPackages(self): """Try to find encap packages.""" self.installed = {} @@ -26,24 +24,24 @@ class Encap(Bcfg2.Client.Tools.PkgTool): self.installed[match.group('name')] = match.group('version') else: print("Failed to split name %s" % pkg) - self.logger.debug("Encap.py: RefreshPackages: self.installed.keys() are:") + self.logger.debug("Encap: RefreshPackages: self.installed.keys() are:") self.logger.debug("%s" % list(self.installed.keys())) def VerifyPackage(self, entry, _): """Verify Package status for entry.""" if not entry.get('version'): - self.logger.info("Insufficient information of Package %s; cannot Verify" % entry.get('name')) + self.logger.info("Insufficient information of Package %s; " + "cannot Verify" % entry.get('name')) return False cmdrc = self.cmd.run("/usr/local/bin/epkg -q -S -k %s-%s >/dev/null" % (entry.get('name'), entry.get('version')))[0] if cmdrc != 0: - self.logger.debug("Package %s version incorrect" % entry.get('name')) + self.logger.debug("Package %s version incorrect" % + entry.get('name')) else: return True return False - # Can use the FindExtraPackages method from Bcfg2.Client.Tools.PkgTool - def RemovePackages(self, packages): """Deal with extra configuration detected.""" names = " ".join([pkg.get('name') for pkg in packages]) -- cgit v1.2.3-1-g7c22