Merge branch 'maint'

Conflicts:
	misc/bcfg2.spec
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Tools/APK.py
	src/lib/Bcfg2/Client/Tools/MacPorts.py
	src/lib/Bcfg2/Client/Tools/Pacman.py
	src/lib/Bcfg2/Client/Tools/YUM.py
	src/lib/Bcfg2/Server/Admin/Minestruct.py
	src/lib/Bcfg2/Server/Admin/Pull.py
	src/lib/Bcfg2/Server/Admin/Viz.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py
	src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py
	src/lib/Bcfg2/Server/Plugins/Properties.py
	src/lib/Bcfg2/settings.py
	src/sbin/bcfg2-crypt
	src/sbin/bcfg2-info
	src/sbin/bcfg2-lint
	src/sbin/bcfg2-yum-helper
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py

10 files changed, 26 insertions, 25 deletions

diff --git a/src/lib/Bcfg2/Client/Tools/APK.py b/src/lib/Bcfg2/Client/Tools/APK.py
index 457197c28..7313f6fcc 100644
--- a/src/lib/Bcfg2/Client/Tools/APK.py
+++ b/src/lib/Bcfg2/Client/Tools/APK.py
@@ -25,7 +25,7 @@ class APK(Bcfg2.Client.Tools.PkgTool):
 
     def VerifyPackage(self, entry, _):
         """Verify Package status for entry."""
-        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
@@ -33,7 +33,7 @@ class APK(Bcfg2.Client.Tools.PkgTool):
         if entry.attrib['name'] in self.installed:
             if entry.attrib['version'] in \
                     ['auto', self.installed[entry.attrib['name']]]:
-                #FIXME: Does APK have any sort of verification mechanism?
+                # FIXME: Does APK have any sort of verification mechanism?
                 return True
             else:
                 self.logger.info(" pkg %s at version %s, not %s" %
diff --git a/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py b/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py
index 31925fa3c..22cf802cf 100644
--- a/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py
+++ b/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py
@@ -29,7 +29,7 @@ class FreeBSDPackage(Bcfg2.Client.Tools.PkgTool):
                 self.installed[name] = version
 
     def VerifyPackage(self, entry, _):
-        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
diff --git a/src/lib/Bcfg2/Client/Tools/IPS.py b/src/lib/Bcfg2/Client/Tools/IPS.py
index c998ff083..0f82b1bc1 100644
--- a/src/lib/Bcfg2/Client/Tools/IPS.py
+++ b/src/lib/Bcfg2/Client/Tools/IPS.py
@@ -37,7 +37,7 @@ class IPS(Bcfg2.Client.Tools.PkgTool):
     def VerifyPackage(self, entry, _):
         """Verify package for entry."""
         pname = entry.get('name')
-        if not 'version' in entry.attrib:
+        if 'version' not in entry.attrib:
             self.logger.info("Cannot verify unversioned package %s" % (pname))
             return False
         if pname not in self.installed:
diff --git a/src/lib/Bcfg2/Client/Tools/MacPorts.py b/src/lib/Bcfg2/Client/Tools/MacPorts.py
index 265171a5a..1e9847c42 100644
--- a/src/lib/Bcfg2/Client/Tools/MacPorts.py
+++ b/src/lib/Bcfg2/Client/Tools/MacPorts.py
@@ -31,16 +31,16 @@ class MacPorts(Bcfg2.Client.Tools.PkgTool):
 
     def VerifyPackage(self, entry, _):
         """Verify Package status for entry."""
-        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
 
         if entry.attrib['name'] in self.installed:
             if (self.installed[entry.attrib['name']] == entry.attrib['version']
-                    or entry.attrib['version'] == 'any'):
-                #FIXME: We should be able to check this once
-                #       http://trac.macports.org/ticket/15709 is implemented
+                or entry.attrib['version'] == 'any'):
+                # FIXME: We should be able to check this once
+                #        http://trac.macports.org/ticket/15709 is implemented
                 return True
             else:
                 self.logger.info("  %s: Wrong version installed.  "
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/Augeas.py b/src/lib/Bcfg2/Client/Tools/POSIX/Augeas.py
index dc5fc6755..fc4e16904 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/Augeas.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/Augeas.py
@@ -195,7 +195,7 @@ class POSIXAugeas(POSIXTool):
         self._augeas = dict()
         # file tool for setting initial values of files that don't
         # exist
-        self.filetool = POSIXFile(logger, setup, config)
+        self.filetool = POSIXFile(config)
 
     def get_augeas(self, entry):
         """ Get an augeas object for the given entry. """
diff --git a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
index 1a3b22506..a7fcb6709 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
@@ -79,7 +79,7 @@ class POSIXUsers(Bcfg2.Client.Tools.Tool):
         defined, and the uid/gid is in that whitelist; or b) no
         whitelist is defined, and the uid/gid is not in the
         blacklist. """
-        if self._whitelist[tag] is None:
+        if not self._whitelist[tag]:
             return eid not in self._blacklist[tag]
         else:
             return eid in self._whitelist[tag]
diff --git a/src/lib/Bcfg2/Client/Tools/Pacman.py b/src/lib/Bcfg2/Client/Tools/Pacman.py
index 2ab9b7403..b82b905e7 100644
--- a/src/lib/Bcfg2/Client/Tools/Pacman.py
+++ b/src/lib/Bcfg2/Client/Tools/Pacman.py
@@ -19,7 +19,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, _):
@@ -28,7 +27,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
@@ -38,8 +37,8 @@ class Pacman(Bcfg2.Client.Tools.PkgTool):
                 return True
             elif self.installed[entry.attrib['name']] == \
                     entry.attrib['version']:
-                #FIXME: need to figure out if pacman
-                #       allows you to verify packages
+                # FIXME: need to figure out if pacman
+                #        allows you to verify packages
                 return True
             else:
                 entry.set('current_version', self.installed[entry.get('name')])
diff --git a/src/lib/Bcfg2/Client/Tools/Portage.py b/src/lib/Bcfg2/Client/Tools/Portage.py
index a61ede820..5c092f46b 100644
--- a/src/lib/Bcfg2/Client/Tools/Portage.py
+++ b/src/lib/Bcfg2/Client/Tools/Portage.py
@@ -50,7 +50,7 @@ class Portage(Bcfg2.Client.Tools.PkgTool):
 
     def VerifyPackage(self, entry, modlist):
         """Verify package for entry."""
-        if not 'version' in entry.attrib:
+        if 'version' not in entry.attrib:
             self.logger.info("Cannot verify unversioned package %s" %
                              (entry.get('name')))
             return False
@@ -68,11 +68,11 @@ class Portage(Bcfg2.Client.Tools.PkgTool):
             if ('verify' not in entry.attrib or
                     entry.get('verify').lower() == 'true'):
 
-            # Check the package if:
-            # - Not running in quick mode
-            # - No verify option is specified in the literal configuration
-            #    OR
-            # - Verify option is specified and is true
+                # Check the package if:
+                # - Not running in quick mode
+                # - No verify option is specified in the literal configuration
+                #    OR
+                # - Verify option is specified and is true
 
                 self.logger.debug('Running equery check on %s' %
                                   entry.get('name'))
diff --git a/src/lib/Bcfg2/Client/Tools/SMF.py b/src/lib/Bcfg2/Client/Tools/SMF.py
index 8b23a4a37..1a580d8a5 100644
--- a/src/lib/Bcfg2/Client/Tools/SMF.py
+++ b/src/lib/Bcfg2/Client/Tools/SMF.py
@@ -25,7 +25,7 @@ class SMF(Bcfg2.Client.Tools.SvcTool):
 
     def GetFMRI(self, entry):
         """Perform FMRI resolution for service."""
-        if not 'FMRI' in entry.attrib:
+        if 'FMRI' not in entry.attrib:
             rv = self.cmd.run(["/usr/bin/svcs", "-H", "-o", "FMRI",
                                entry.get('name')])
             if rv.success:
diff --git a/src/lib/Bcfg2/Client/Tools/YUM.py b/src/lib/Bcfg2/Client/Tools/YUM.py
index 7782581c1..ee1cd6fad 100644
--- a/src/lib/Bcfg2/Client/Tools/YUM.py
+++ b/src/lib/Bcfg2/Client/Tools/YUM.py
@@ -894,7 +894,7 @@ class YUM(Bcfg2.Client.Tools.PkgTool):
 
         cleanup()
 
-    def Install(self, packages):  # pylint: disable=R0912,R0914
+    def Install(self, packages):  # pylint: disable=R0912,R0914,R0915
         """ Try and fix everything that Yum.VerifyPackages() found
         wrong for each Package Entry.  This can result in individual
         RPMs being installed (for the first time), deleted, downgraded
@@ -956,14 +956,16 @@ class YUM(Bcfg2.Client.Tools.PkgTool):
                         continue
                     status = self.instance_status[inst]
                     if (not status.get('installed', False) and
-                            Bcfg2.Options.setup.yum_install_missing):
+                        Bcfg2.Options.setup.yum_install_missing):
                         queue_pkg(pkg, inst, install_pkgs)
-                    elif status.get('version_fail', False) and self.do_upgrade:
+                    elif (status.get('version_fail', False) and
+                          Bcfg2.Options.setup.yum_fix_version):
                         if pkg.get("package_fail_action") == "downgrade":
                             queue_pkg(pkg, inst, downgrade_pkgs)
                         else:
                             queue_pkg(pkg, inst, upgrade_pkgs)
-                    elif status.get('verify_fail', False) and self.do_reinst:
+                    elif (status.get('verify_fail', False) and
+                          Bcfg2.Options.setup.yum_reinstall_broken):
                         queue_pkg(pkg, inst, reinstall_pkgs)
                     else:
                         # Either there was no Install/Version/Verify