Merge branch 'maint'

Conflicts:
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Frame.py
	src/lib/Bcfg2/Client/Tools/YUM.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Admin/Perf.py
	src/lib/Bcfg2/Server/Admin/Xcmd.py
	src/lib/Bcfg2/Server/Admin/__init__.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/FileMonitor/Fam.py
	src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Base.py
	src/lib/Bcfg2/Server/Plugins/Bundler.py
	src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py
	src/lib/Bcfg2/Server/Plugins/Cvs.py
	src/lib/Bcfg2/Server/Plugins/Darcs.py
	src/lib/Bcfg2/Server/Plugins/Decisions.py
	src/lib/Bcfg2/Server/Plugins/FileProbes.py
	src/lib/Bcfg2/Server/Plugins/Fossil.py
	src/lib/Bcfg2/Server/Plugins/Git.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/Plugins/NagiosGen.py
	src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
	src/lib/Bcfg2/Server/Plugins/Packages/Source.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
	src/lib/Bcfg2/Server/Plugins/Properties.py
	src/lib/Bcfg2/Server/Plugins/__init__.py
	src/lib/Bcfg2/Server/__init__.py
	src/sbin/bcfg2-build-reports
	src/sbin/bcfg2-crypt
	testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py

18 files changed, 136 insertions, 112 deletions

diff --git a/src/lib/Bcfg2/Client/Tools/APK.py b/src/lib/Bcfg2/Client/Tools/APK.py
index 553339fc9..46f46bb1c 100644
--- a/src/lib/Bcfg2/Client/Tools/APK.py
+++ b/src/lib/Bcfg2/Client/Tools/APK.py
@@ -27,7 +27,7 @@ class APK(Bcfg2.Client.Tools.PkgTool):
         """Verify Package status for entry."""
         if not 'version' in entry.attrib:
             self.logger.info("Cannot verify unversioned package %s" %
-               (entry.attrib['name']))
+                             entry.attrib['name'])
             return False
 
         if entry.attrib['name'] in self.installed:
diff --git a/src/lib/Bcfg2/Client/Tools/Action.py b/src/lib/Bcfg2/Client/Tools/Action.py
index 7b62f61c7..fd2c467d7 100644
--- a/src/lib/Bcfg2/Client/Tools/Action.py
+++ b/src/lib/Bcfg2/Client/Tools/Action.py
@@ -19,12 +19,12 @@ class Action(Bcfg2.Client.Tools.Tool):
         the whitelist or blacklist """
         if self.setup['decision'] == 'whitelist' and \
            not matches_white_list(action, self.setup['decision_list']):
-            self.logger.info("In whitelist mode: suppressing Action:" + \
+            self.logger.info("In whitelist mode: suppressing Action: %s" %
                              action.get('name'))
             return False
         if self.setup['decision'] == 'blacklist' and \
            not passes_black_list(action, self.setup['decision_list']):
-            self.logger.info("In blacklist mode: suppressing Action:" + \
+            self.logger.info("In blacklist mode: suppressing Action: %s" %
                              action.get('name'))
             return False
         return True
diff --git a/src/lib/Bcfg2/Client/Tools/DebInit.py b/src/lib/Bcfg2/Client/Tools/DebInit.py
index ca556e98b..d916b1662 100644
--- a/src/lib/Bcfg2/Client/Tools/DebInit.py
+++ b/src/lib/Bcfg2/Client/Tools/DebInit.py
@@ -16,7 +16,7 @@ class DebInit(Bcfg2.Client.Tools.SvcTool):
     __handles__ = [('Service', 'deb')]
     __req__ = {'Service': ['name', 'status']}
     svcre = \
-        re.compile("/etc/.*/(?P<action>[SK])(?P<sequence>\d+)(?P<name>\S+)")
+        re.compile(r'/etc/.*/(?P<action>[SK])(?P<sequence>\d+)(?P<name>\S+)')
 
     # implement entry (Verify|Install) ops
     def VerifyService(self, entry, _):
diff --git a/src/lib/Bcfg2/Client/Tools/Encap.py b/src/lib/Bcfg2/Client/Tools/Encap.py
index 678e0f00c..270f0a5f2 100644
--- a/src/lib/Bcfg2/Client/Tools/Encap.py
+++ b/src/lib/Bcfg2/Client/Tools/Encap.py
@@ -13,7 +13,7 @@ class Encap(Bcfg2.Client.Tools.PkgTool):
     __req__ = {'Package': ['version', 'url']}
     pkgtype = 'encap'
     pkgtool = ("/usr/local/bin/epkg -l -f -q %s", ("%s", ["url"]))
-    splitter = re.compile('.*/(?P<name>[\w-]+)\-(?P<version>[\w\.+-]+)')
+    splitter = re.compile(r'.*/(?P<name>[\w-]+)\-(?P<version>[\w\.+-]+)')
 
     def RefreshPackages(self):
         """Try to find encap packages."""
diff --git a/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py b/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py
index 635318805..31925fa3c 100644
--- a/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py
+++ b/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py
@@ -21,7 +21,7 @@ class FreeBSDPackage(Bcfg2.Client.Tools.PkgTool):
     def RefreshPackages(self):
         self.installed = {}
         packages = self.cmd.run("/usr/sbin/pkg_info -a -E").stdout.splitlines()
-        pattern = re.compile('(.*)-(\d.*)')
+        pattern = re.compile(r'(.*)-(\d.*)')
         for pkg in packages:
             if pattern.match(pkg):
                 name = pattern.match(pkg).group(1)
@@ -31,7 +31,7 @@ class FreeBSDPackage(Bcfg2.Client.Tools.PkgTool):
     def VerifyPackage(self, entry, _):
         if not 'version' in entry.attrib:
             self.logger.info("Cannot verify unversioned package %s" %
-               (entry.attrib['name']))
+                             entry.attrib['name'])
             return False
         if entry.attrib['name'] in self.installed:
             if self.installed[entry.attrib['name']] == entry.attrib['version']:
diff --git a/src/lib/Bcfg2/Client/Tools/IPS.py b/src/lib/Bcfg2/Client/Tools/IPS.py
index e4c9d605d..c998ff083 100644
--- a/src/lib/Bcfg2/Client/Tools/IPS.py
+++ b/src/lib/Bcfg2/Client/Tools/IPS.py
@@ -50,9 +50,9 @@ class IPS(Bcfg2.Client.Tools.PkgTool):
             pass
         else:
             if entry.get('version') != self.installed[pname]:
-                self.logger.debug("IPS: Package %s: have %s want %s" \
-                                  % (pname, self.installed[pname],
-                                     entry.get('version')))
+                self.logger.debug("IPS: Package %s: have %s want %s" %
+                                  (pname, self.installed[pname],
+                                   entry.get('version')))
                 return False
 
         # need to implement pkg chksum validation
diff --git a/src/lib/Bcfg2/Client/Tools/MacPorts.py b/src/lib/Bcfg2/Client/Tools/MacPorts.py
index 5b395a170..dcf58cfec 100644
--- a/src/lib/Bcfg2/Client/Tools/MacPorts.py
+++ b/src/lib/Bcfg2/Client/Tools/MacPorts.py
@@ -33,7 +33,7 @@ class MacPorts(Bcfg2.Client.Tools.PkgTool):
         """Verify Package status for entry."""
         if not 'version' in entry.attrib:
             self.logger.info("Cannot verify unversioned package %s" %
-               (entry.attrib['name']))
+                             entry.attrib['name'])
             return False
 
         if entry.attrib['name'] in self.installed:
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/Device.py b/src/lib/Bcfg2/Client/Tools/POSIX/Device.py
index d5aaf069d..9b84adad0 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/Device.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/Device.py
@@ -12,8 +12,8 @@ class POSIXDevice(POSIXTool):
     def fully_specified(self, entry):
         if entry.get('dev_type') in ['block', 'char']:
             # check if major/minor are properly specified
-            if (entry.get('major') == None or
-                entry.get('minor') == None):
+            if (entry.get('major') is None or
+                entry.get('minor') is None):
                 return False
         return True
 
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/File.py b/src/lib/Bcfg2/Client/Tools/POSIX/File.py
index 9b95d2234..168c35c98 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/File.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/File.py
@@ -34,13 +34,11 @@ class POSIXFile(POSIXTool):
 
     def _get_data(self, entry):
         """ Get a tuple of (<file data>, <is binary>) for the given entry """
-        is_binary = False
-        if entry.get('encoding', 'ascii') == 'base64':
-            tempdata = b64decode(entry.text)
-            is_binary = True
-
-        elif entry.get('empty', 'false') == 'true':
+        is_binary = entry.get('encoding', 'ascii') == 'base64'
+        if entry.get('empty', 'false') == 'true' or not entry.text:
             tempdata = ''
+        elif is_binary:
+            tempdata = b64decode(entry.text)
         else:
             tempdata = entry.text
             if isinstance(tempdata, unicode) and unicode != str:
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/base.py b/src/lib/Bcfg2/Client/Tools/POSIX/base.py
index f46875743..16fe0acb5 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/base.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/base.py
@@ -275,7 +275,7 @@ class POSIXTool(Bcfg2.Client.Tools.Tool):
         if path is None:
             path = entry.get("name")
         context = entry.get("secontext")
-        if context is None:
+        if not context:
             # no context listed
             return True
 
@@ -520,13 +520,19 @@ class POSIXTool(Bcfg2.Client.Tools.Tool):
                               "Current mtime is %s but should be %s" %
                               (path, mtime, entry.get('mtime')))
 
-        if HAS_SELINUX and entry.get("secontext"):
+        if HAS_SELINUX:
+            wanted_secontext = None
             if entry.get("secontext") == "__default__":
-                wanted_secontext = \
-                    selinux.matchpathcon(path, 0)[1].split(":")[2]
+                try:
+                    wanted_secontext = \
+                        selinux.matchpathcon(path, 0)[1].split(":")[2]
+                except OSError:
+                    errors.append("%s has no default SELinux context" %
+                                  entry.get("name"))
             else:
                 wanted_secontext = entry.get("secontext")
-            if attrib['current_secontext'] != wanted_secontext:
+            if (wanted_secontext and
+                attrib['current_secontext'] != wanted_secontext):
                 errors.append("SELinux context for path %s is incorrect. "
                               "Current context is %s but should be %s" %
                               (path, attrib['current_secontext'],
@@ -712,8 +718,8 @@ class POSIXTool(Bcfg2.Client.Tools.Tool):
         tmpentry.set('mode', oct_mode(newmode))
         for acl in tmpentry.findall('ACL'):
             acl.set('perms',
-                    oct_mode(self._norm_acl_perms(acl.get('perms')) | \
-                                 ACL_MAP['x']))
+                    oct_mode(self._norm_acl_perms(acl.get('perms')) |
+                             ACL_MAP['x']))
         for cpath in created:
             rv &= self._set_perms(tmpentry, path=cpath)
         return rv
diff --git a/src/lib/Bcfg2/Client/Tools/Pacman.py b/src/lib/Bcfg2/Client/Tools/Pacman.py
index 15fab53bd..d7d60a66d 100644
--- a/src/lib/Bcfg2/Client/Tools/Pacman.py
+++ b/src/lib/Bcfg2/Client/Tools/Pacman.py
@@ -25,12 +25,12 @@ class Pacman(Bcfg2.Client.Tools.PkgTool):
     def VerifyPackage(self, entry, _):
         '''Verify Package status for entry'''
 
-        self.logger.info("VerifyPackage : %s : %s" % entry.get('name'),
-                                                     entry.get('version'))
+        self.logger.info("VerifyPackage: %s : %s" % (entry.get('name'),
+                                                     entry.get('version')))
 
         if not 'version' in entry.attrib:
             self.logger.info("Cannot verify unversioned package %s" %
-               (entry.attrib['name']))
+                             entry.attrib['name'])
             return False
 
         if entry.attrib['name'] in self.installed:
diff --git a/src/lib/Bcfg2/Client/Tools/Portage.py b/src/lib/Bcfg2/Client/Tools/Portage.py
index 32afa8cbf..5e319a414 100644
--- a/src/lib/Bcfg2/Client/Tools/Portage.py
+++ b/src/lib/Bcfg2/Client/Tools/Portage.py
@@ -13,8 +13,8 @@ class Portage(Bcfg2.Client.Tools.PkgTool):
     __req__ = {'Package': ['name', 'version']}
     pkgtype = 'ebuild'
     # requires a working PORTAGE_BINHOST in make.conf
-    _binpkgtool = ('emerge --getbinpkgonly %s', ('=%s-%s', \
-                                     ['name', 'version']))
+    _binpkgtool = ('emerge --getbinpkgonly %s', ('=%s-%s', ['name',
+                                                            'version']))
     pkgtool = ('emerge %s', ('=%s-%s', ['name', 'version']))
 
     def __init__(self, config):
@@ -22,7 +22,7 @@ class Portage(Bcfg2.Client.Tools.PkgTool):
         Bcfg2.Client.Tools.PkgTool.__init__(self, config)
         self._initialised = True
         self.__important__ = self.__important__ + ['/etc/make.conf']
-        self._pkg_pattern = re.compile('(.*)-(\d.*)')
+        self._pkg_pattern = re.compile(r'(.*)-(\d.*)')
         self._ebuild_pattern = re.compile('(ebuild|binary)')
         self.installed = {}
         self._binpkgonly = self.setup.get('portage_binpkgonly', False)
diff --git a/src/lib/Bcfg2/Client/Tools/RcUpdate.py b/src/lib/Bcfg2/Client/Tools/RcUpdate.py
index 552b27842..4b78581f7 100644
--- a/src/lib/Bcfg2/Client/Tools/RcUpdate.py
+++ b/src/lib/Bcfg2/Client/Tools/RcUpdate.py
@@ -12,6 +12,15 @@ class RcUpdate(Bcfg2.Client.Tools.SvcTool):
     __handles__ = [('Service', 'rc-update')]
     __req__ = {'Service': ['name', 'status']}
 
+    def get_enabled_svcs(self):
+        """
+        Return a list of all enabled services.
+        """
+        return [line.split()[0]
+                for line in self.cmd.run(['/bin/rc-status',
+                                          '-s']).stdout.splitlines()
+                if 'started' in line]
+
     def VerifyService(self, entry, _):
         """
         Verify Service status for entry.
@@ -21,9 +30,12 @@ class RcUpdate(Bcfg2.Client.Tools.SvcTool):
         if entry.get('status') == 'ignore':
             return True
 
+        # get a list of all started services
+        allsrv = self.get_enabled_svcs()
+
         # check if service is enabled
-        result = self.cmd.run(["/sbin/rc-update", "show", "default"])
-        is_enabled = entry.get("name") in result.stdout
+        result = self.cmd.run(["/sbin/rc-update", "show", "default"]).stdout
+        is_enabled = entry.get("name") in result
 
         # check if init script exists
         try:
@@ -34,8 +46,7 @@ class RcUpdate(Bcfg2.Client.Tools.SvcTool):
             return False
 
         # check if service is enabled
-        result = self.cmd.run(self.get_svc_command(entry, "status"))
-        is_running = "started" in result.stdout
+        is_running = entry.get('name') in allsrv
 
         if entry.get('status') == 'on' and not (is_enabled and is_running):
             entry.set('current_status', 'off')
@@ -70,10 +81,7 @@ class RcUpdate(Bcfg2.Client.Tools.SvcTool):
 
     def FindExtra(self):
         """Locate extra rc-update services."""
-        allsrv = [line.split()[0]
-                  for line in self.cmd.run(['/bin/rc-status',
-                                            '-s']).stdout.splitlines()
-                  if 'started' in line]
+        allsrv = self.get_enabled_svcs()
         self.logger.debug('Found active services:')
         self.logger.debug(allsrv)
         specified = [srv.get('name') for srv in self.getSupportedEntries()]
diff --git a/src/lib/Bcfg2/Client/Tools/SELinux.py b/src/lib/Bcfg2/Client/Tools/SELinux.py
index baf930610..f38615062 100644
--- a/src/lib/Bcfg2/Client/Tools/SELinux.py
+++ b/src/lib/Bcfg2/Client/Tools/SELinux.py
@@ -13,6 +13,7 @@ import seobject
 import Bcfg2.Client.XML
 import Bcfg2.Client.Tools
 from Bcfg2.Client.Tools.POSIX.File import POSIXFile
+from Bcfg2.Compat import long  # pylint: disable=W0622
 
 
 def pack128(int_val):
@@ -48,7 +49,7 @@ def netmask_itoa(netmask, proto="ipv4"):
     if netmask > size:
         raise ValueError("Netmask too large: %s" % netmask)
 
-    res = 0L
+    res = long(0)
     for i in range(netmask):
         res |= 1 << (size - i - 1)
     netmask = socket.inet_ntop(family, pack128(res))
@@ -167,7 +168,7 @@ class SELinuxEntryHandler(object):
     key_format = ("name",)
     value_format = ()
     str_format = '%(name)s'
-    custom_re = re.compile(' (?P<name>\S+)$')
+    custom_re = re.compile(r' (?P<name>\S+)$')
     custom_format = None
 
     def __init__(self, tool, config):
@@ -200,7 +201,16 @@ class SELinuxEntryHandler(object):
         type, if the records object supports the customized() method
         """
         if hasattr(self.records, "customized") and self.custom_re:
-            return dict([(k, self.all_records[k]) for k in self.custom_keys])
+            rv = dict()
+            for key in self.custom_keys:
+                if key in self.all_records:
+                    rv[key] = self.all_records[key]
+                else:
+                    self.logger.warning("SELinux %s %s customized, but no "
+                                        "record found. This may indicate an "
+                                        "error in your SELinux policy." %
+                                        (self.etype, key))
+            return rv
         else:
             # ValueError is really a pretty dumb exception to raise,
             # but that's what the seobject customized() method raises
@@ -504,14 +514,14 @@ class SELinuxSefcontextHandler(SELinuxEntryHandler):
                         char="-c",
                         door="-D")
     filetypenames = dict(all="all files",
-                        regular="regular file",
-                        directory="directory",
-                        symlink="symbolic link",
-                        pipe="named pipe",
-                        socket="socket",
-                        block="block device",
-                        char="character device",
-                        door="door")
+                         regular="regular file",
+                         directory="directory",
+                         symlink="symbolic link",
+                         pipe="named pipe",
+                         socket="socket",
+                         block="block device",
+                         char="character device",
+                         door="door")
     filetypeattrs = dict([v, k] for k, v in filetypenames.iteritems())
     custom_re = re.compile(r'-f \'(?P<filetype>[a-z ]+)\'.*? \'(?P<name>.*)\'')
 
diff --git a/src/lib/Bcfg2/Client/Tools/SMF.py b/src/lib/Bcfg2/Client/Tools/SMF.py
index 68d8b2965..8b23a4a37 100644
--- a/src/lib/Bcfg2/Client/Tools/SMF.py
+++ b/src/lib/Bcfg2/Client/Tools/SMF.py
@@ -48,12 +48,12 @@ class SMF(Bcfg2.Client.Tools.SvcTool):
             gname = "/etc/rc*.d/%s" % filename
             files = glob.glob(gname.replace('_', '.'))
             if files:
-                self.logger.debug("Matched %s with %s" % \
+                self.logger.debug("Matched %s with %s" %
                                   (entry.get("FMRI"), ":".join(files)))
                 return entry.get('status') == 'on'
             else:
-                self.logger.debug("No service matching %s" % \
-                                  (entry.get("FMRI")))
+                self.logger.debug("No service matching %s" %
+                                  entry.get("FMRI"))
                 return entry.get('status') == 'off'
         try:
             srvdata = \
@@ -76,13 +76,12 @@ class SMF(Bcfg2.Client.Tools.SvcTool):
             if entry.get("FMRI").startswith('lrc'):
                 try:
                     loc = entry.get("FMRI")[4:].replace('_', '.')
-                    self.logger.debug("Renaming file %s to %s" % \
+                    self.logger.debug("Renaming file %s to %s" %
                                       (loc, loc.replace('/S', '/DISABLED.S')))
                     os.rename(loc, loc.replace('/S', '/DISABLED.S'))
                     return True
                 except OSError:
-                    self.logger.error("Failed to rename init script %s" % \
-                                      (loc))
+                    self.logger.error("Failed to rename init script %s" % loc)
                     return False
             else:
                 return self.cmd.run("/usr/sbin/svcadm disable %s" %
@@ -118,12 +117,12 @@ class SMF(Bcfg2.Client.Tools.SvcTool):
 
     def FindExtra(self):
         """Find Extra SMF Services."""
-        allsrv = [name for name, version in \
-                  [srvc.split()
-                   for srvc in self.cmd.run([
-                        "/usr/bin/svcs", "-a", "-H",
-                        "-o", "FMRI,STATE"]).stdout.splitlines()]
-                  if version != 'disabled']
+        allsrv = []
+        for srvc in self.cmd.run(["/usr/bin/svcs", "-a", "-H",
+                                  "-o", "FMRI,STATE"]).stdout.splitlines():
+            name, version = srvc.split()
+            if version != 'disabled':
+                allsrv.append(name)
 
         for svc in self.getSupportedEntries():
             if svc.get("FMRI") in allsrv:
diff --git a/src/lib/Bcfg2/Client/Tools/SYSV.py b/src/lib/Bcfg2/Client/Tools/SYSV.py
index b5afa629d..7be7b6fa3 100644
--- a/src/lib/Bcfg2/Client/Tools/SYSV.py
+++ b/src/lib/Bcfg2/Client/Tools/SYSV.py
@@ -41,7 +41,7 @@ class SYSV(Bcfg2.Client.Tools.PkgTool):
             self.noaskfile.write(noask)
             # flush admin file contents to disk
             self.noaskfile.flush()
-            self.pkgtool = (self.pkgtool[0] % ("-a %s" % (self.noaskname)), \
+            self.pkgtool = (self.pkgtool[0] % ("-a %s" % (self.noaskname)),
                             self.pkgtool[1])
         except:  # pylint: disable=W0702
             self.pkgtool = (self.pkgtool[0] % "", self.pkgtool[1])
@@ -66,7 +66,7 @@ class SYSV(Bcfg2.Client.Tools.PkgTool):
         desired_version = entry.get('version')
         if desired_version == 'any':
             desired_version = self.installed.get(entry.get('name'),
-                                                desired_version)
+                                                 desired_version)
 
         if not self.cmd.run(["/usr/bin/pkginfo", "-q", "-v",
                              desired_version, entry.get('name')]):
diff --git a/src/lib/Bcfg2/Client/Tools/Upstart.py b/src/lib/Bcfg2/Client/Tools/Upstart.py
index cd1c4a2bc..c96eab69d 100644
--- a/src/lib/Bcfg2/Client/Tools/Upstart.py
+++ b/src/lib/Bcfg2/Client/Tools/Upstart.py
@@ -46,9 +46,9 @@ class Upstart(Bcfg2.Client.Tools.SvcTool):
                               entry.get('name'))
             return False
 
-        match = re.compile("%s( \(.*\))? (start|stop)/(running|waiting)" %
+        match = re.compile(r'%s( \(.*\))? (start|stop)/(running|waiting)' %
                            entry.get('name')).match(output)
-        if match == None:
+        if match is None:
             # service does not exist
             entry.set('current_status', 'off')
             status = False
diff --git a/src/lib/Bcfg2/Client/Tools/YUM.py b/src/lib/Bcfg2/Client/Tools/YUM.py
index 57ca06e77..147615f47 100644
--- a/src/lib/Bcfg2/Client/Tools/YUM.py
+++ b/src/lib/Bcfg2/Client/Tools/YUM.py
@@ -133,10 +133,12 @@ class YUM(Bcfg2.Client.Tools.PkgTool):
     def __init__(self, config):
         self.yumbase = self._loadYumBase()
         Bcfg2.Client.Tools.PkgTool.__init__(self, config)
-        self.ignores = [entry.get('name') for struct in config \
-                        for entry in struct \
-                        if entry.tag == 'Path' and \
-                        entry.get('type') == 'ignore']
+        self.ignores = []
+        for struct in config:
+            self.ignores.extend([entry.get('name')
+                                 for entry in struct
+                                 if (entry.tag == 'Path' and
+                                     entry.get('type') == 'ignore')])
         self.instance_status = {}
         self.extra_instances = []
         self.modlists = {}
@@ -296,8 +298,8 @@ class YUM(Bcfg2.Client.Tools.PkgTool):
         group. """
         missing = Bcfg2.Client.Tools.PkgTool.missing_attrs(self, entry)
 
-        if entry.get('name', None) == None and \
-           entry.get('group', None) == None:
+        if (entry.get('name', None) is None and
+            entry.get('group', None) is None):
             missing += ['name', 'group']
         return missing
 
@@ -425,10 +427,10 @@ class YUM(Bcfg2.Client.Tools.PkgTool):
 
         if entry.get('group'):
             self.logger.debug("Verifying packages for group %s" %
-                               entry.get('group'))
+                              entry.get('group'))
         else:
             self.logger.debug("Verifying package instances for %s" %
-                               entry.get('name'))
+                              entry.get('name'))
 
         self.verify_cache = dict()  # Used for checking multilib packages
         self.modlists[entry] = modlist
@@ -437,10 +439,10 @@ class YUM(Bcfg2.Client.Tools.PkgTool):
         package_fail = False
         qtext_versions = []
         virt_pkg = False
-        pkg_checks = self.pkg_checks and \
-                entry.get('pkg_checks', 'true').lower() == 'true'
-        pkg_verify = self.pkg_verify and \
-                entry.get('pkg_verify', 'true').lower() == 'true'
+        pkg_checks = (self.pkg_checks and
+                      entry.get('pkg_checks', 'true').lower() == 'true')
+        pkg_verify = (self.pkg_verify and
+                      entry.get('pkg_verify', 'true').lower() == 'true')
         yum_group = False
 
         if entry.get('name') == 'gpg-pubkey':
@@ -458,15 +460,13 @@ class YUM(Bcfg2.Client.Tools.PkgTool):
                                   if d]
                 group_type = entry.get('choose', 'default')
                 if group_type in ['default', 'optional', 'all']:
-                    group_packages += [p
-                                       for p, d in
-                                                 group.default_packages.items()
-                                       if d]
+                    group_packages += [
+                        p for p, d in group.default_packages.items()
+                        if d]
                 if group_type in ['optional', 'all']:
-                    group_packages += [p
-                                       for p, d in
-                                                group.optional_packages.items()
-                                       if d]
+                    group_packages += [
+                        p for p, d in group.optional_packages.items()
+                        if d]
                 if len(group_packages) == 0:
                     self.logger.error("No packages found for group %s" %
                                       entry.get("group"))
@@ -492,7 +492,7 @@ class YUM(Bcfg2.Client.Tools.PkgTool):
         else:
             all_pkg_objs = \
                 self.yumbase.rpmdb.searchNevra(name=entry.get('name'))
-        if len(all_pkg_objs) == 0 and yum_group != True:
+        if len(all_pkg_objs) == 0 and yum_group is not True:
             # Some sort of virtual capability?  Try to resolve it
             all_pkg_objs = self.yumbase.rpmdb.searchProvides(entry.get('name'))
             if len(all_pkg_objs) > 0:
@@ -570,9 +570,9 @@ class YUM(Bcfg2.Client.Tools.PkgTool):
                     pkg_objs = [po for po in all_pkg_objs]
                 else:
                     pkg_objs = [po for po in all_pkg_objs
-                            if po.checkPrco('provides',
-                                            (nevra["name"], 'EQ',
-                                             tuple(vlist)))]
+                                if po.checkPrco('provides',
+                                                (nevra["name"], 'EQ',
+                                                 tuple(vlist)))]
             elif entry.get('name') == 'gpg-pubkey':
                 if 'version' not in nevra:
                     self.logger.warning("Skipping verify: gpg-pubkey without "
@@ -625,7 +625,7 @@ class YUM(Bcfg2.Client.Tools.PkgTool):
             if self.setup.get('quick', False):
                 # Passed -q on the command line
                 continue
-            if not (pkg_verify and \
+            if not (pkg_verify and
                     inst.get('pkg_verify', 'true').lower() == 'true'):
                 continue
 
@@ -651,8 +651,8 @@ class YUM(Bcfg2.Client.Tools.PkgTool):
 
             # Now take out the Yum specific objects / modlists / unproblems
             ignores = [ig.get('name') for ig in entry.findall('Ignore')] + \
-                      [ig.get('name') for ig in inst.findall('Ignore')] + \
-                      self.ignores
+                [ig.get('name') for ig in inst.findall('Ignore')] + \
+                self.ignores
             for fname, probs in list(vrfy_result.items()):
                 if fname in modlist:
                     self.logger.debug("  %s in modlist, skipping" % fname)
@@ -740,8 +740,9 @@ class YUM(Bcfg2.Client.Tools.PkgTool):
         for pkg in pkg_objs:
             self.logger.debug("  Extra Instance Found: %s" % str(pkg))
             Bcfg2.Client.XML.SubElement(extra_entry, 'Instance',
-                    epoch=pkg.epoch, name=pkg.name, version=pkg.version,
-                    release=pkg.release, arch=pkg.arch)
+                                        epoch=pkg.epoch, name=pkg.name,
+                                        version=pkg.version,
+                                        release=pkg.release, arch=pkg.arch)
 
         if pkg_objs == []:
             return None
@@ -785,7 +786,7 @@ class YUM(Bcfg2.Client.Tools.PkgTool):
         ver = yum.misc.keyIdToRPMVer(gpg['keyid'])
         rel = yum.misc.keyIdToRPMVer(gpg['timestamp'])
         if not (ver == inst.get('version') and rel == inst.get('release')):
-            self.logger.info("GPG key file %s does not match gpg-pubkey-%s-%s"\
+            self.logger.info("GPG key file %s does not match gpg-pubkey-%s-%s"
                              % (key_file, inst.get('version'),
                                 inst.get('release')))
             return False
@@ -794,20 +795,21 @@ class YUM(Bcfg2.Client.Tools.PkgTool):
                                      gpg['timestamp']) == 0:
             result = tset.pgpImportPubkey(yum.misc.procgpgkey(rawkey))
         else:
-            self.logger.debug("gpg-pubkey-%s-%s already installed"\
-                              % (inst.get('version'),
-                                 inst.get('release')))
+            self.logger.debug("gpg-pubkey-%s-%s already installed" %
+                              (inst.get('version'), inst.get('release')))
             return True
 
         if result != 0:
-            self.logger.debug("Unable to install %s-%s" % \
-                        (self.instance_status[inst].get('pkg').get('name'),
-                         nevra2string(inst)))
+            self.logger.debug(
+                "Unable to install %s-%s" %
+                (self.instance_status[inst].get('pkg').get('name'),
+                 nevra2string(inst)))
             return False
         else:
-            self.logger.debug("Installed %s-%s-%s" % \
-                        (self.instance_status[inst].get('pkg').get('name'),
-                         inst.get('version'), inst.get('release')))
+            self.logger.debug(
+                "Installed %s-%s-%s" %
+                (self.instance_status[inst].get('pkg').get('name'),
+                 inst.get('version'), inst.get('release')))
             return True
 
     def _runYumTransaction(self):
@@ -902,7 +904,7 @@ class YUM(Bcfg2.Client.Tools.PkgTool):
         # Remove extra instances.
         # Can not reverify because we don't have a package entry.
         if self.extra_instances is not None and len(self.extra_instances) > 0:
-            if (self.setup.get('remove') == 'all' or \
+            if (self.setup.get('remove') == 'all' or
                 self.setup.get('remove') == 'packages'):
                 self.Remove(self.extra_instances)
             else:
@@ -917,7 +919,7 @@ class YUM(Bcfg2.Client.Tools.PkgTool):
         # Figure out which instances of the packages actually need something
         # doing to them and place in the appropriate work 'queue'.
         for pkg in packages:
-            insts = [pinst for pinst in pkg \
+            insts = [pinst for pinst in pkg
                      if pinst.tag in ['Instance', 'Package']]
             if insts:
                 for inst in insts:
@@ -1010,10 +1012,11 @@ class YUM(Bcfg2.Client.Tools.PkgTool):
 
         if not self.setup['kevlar']:
             for pkg_entry in [p for p in packages if self.canVerify(p)]:
-                self.logger.debug("Reverifying Failed Package %s" \
-                        % (pkg_entry.get('name')))
-                states[pkg_entry] = self.VerifyPackage(pkg_entry,
-                        self.modlists.get(pkg_entry, []))
+                self.logger.debug("Reverifying Failed Package %s" %
+                                  pkg_entry.get('name'))
+                states[pkg_entry] = \
+                    self.VerifyPackage(pkg_entry,
+                                       self.modlists.get(pkg_entry, []))
 
         self.modified.extend(ent for ent in packages if states[ent])
         return states