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

21 files changed, 86 insertions, 64 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
diff --git a/src/lib/Bcfg2/DBSettings.py b/src/lib/Bcfg2/DBSettings.py
index 3b2edd849..c5b78ed0b 100644
--- a/src/lib/Bcfg2/DBSettings.py
+++ b/src/lib/Bcfg2/DBSettings.py
@@ -169,10 +169,10 @@ class PerApplicationRouter(object):
     """ Django database router for redirecting different applications to their
     own database """
 
-    def _db_per_app(self, model, **hints):
+    def _db_per_app(self, model, **_):
         """ If a database with the same name as the application exists, use it.
         Otherwise use the default """
-        return get_db_label(model._meta.app_label)
+        return get_db_label(model._meta.app_label)  # pylint: disable=W0212
 
     def db_for_read(self, model, **hints):
         """ Called when Django wants to find out what database to read from """
@@ -182,12 +182,14 @@ class PerApplicationRouter(object):
         """ Called when Django wants to find out what database to write to """
         return self._db_per_app(model, **hints)
 
-    def allow_relation(self, obj1, obj2, **hints):
+    def allow_relation(self, obj1, obj2, **_):
         """ Called when Django wants to determine what relations to allow. Only
         allow relations within an app """
+        # pylint: disable=W0212
         return obj1._meta.app_label == obj2._meta.app_label
+        # pylint: enable=W0212
 
-    def allow_syncdb(self, db, model):
+    def allow_syncdb(self, *_):
         """ Called when Django wants to determine which models to sync to a
         given database.  Take the cowards way out and sync all models to all
         databases to allow for easy migrations. """
diff --git a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
index b2d26d190..687b4b571 100644
--- a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
+++ b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
@@ -371,8 +371,8 @@ class DjangoORM(StorageBase):
             self.logger.error("Failed to import interaction: %s" %
                     traceback.format_exc().splitlines()[-1])
         finally:
-            self.logger.info("%s: Closing database connection" %
-                             self.__class__.__name__)
+            self.logger.debug("%s: Closing database connection" %
+                              self.__class__.__name__)
             db.close_connection()
 
 
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index 9c22d17ac..544f417b4 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -26,7 +26,6 @@ from Bcfg2.Server.Plugin import track_statistics
 
 try:
     from django.core.exceptions import ImproperlyConfigured
-    from django.core import management
     import django.conf
     HAS_DJANGO = True
 except ImportError:
@@ -146,6 +145,10 @@ class Core(object):
             default='off',
             choices=['off', 'on', 'initial', 'cautious', 'aggressive'])]
 
+    #: The name of this server core. This can be overridden by core
+    #: implementations to provide a more specific name.
+    name = "Core"
+
     def __init__(self):  # pylint: disable=R0912,R0915
         """
         .. automethod:: _run
@@ -356,7 +359,7 @@ class Core(object):
         This does not start plugin threads; that is done later, in
         :func:`Bcfg2.Server.Core.BaseCore.run` """
         for plugin in Bcfg2.Options.setup.plugins:
-            if not plugin in self.plugins:
+            if plugin not in self.plugins:
                 self.init_plugin(plugin)
 
         # Remove blacklisted plugins
diff --git a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
index 22c97a0fe..ebf4c4954 100644
--- a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
+++ b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
@@ -212,7 +212,7 @@ class RequiredAttrs(Bcfg2.Server.Lint.ServerPlugin):
                             "attribute: \n%s" % self.RenderXML(path))
                 # ensure that abstract Package tags have either name
                 # or group specified
-                for package in xdata.xpath("//Package"):
+                for package in bundle.xdata.xpath("//Package"):
                     if ('name' not in package.attrib and
                         'group' not in package.attrib):
                         self.LintError(
diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py
index 407e9df46..b5ab1c18b 100644
--- a/src/lib/Bcfg2/Server/Plugin/helpers.py
+++ b/src/lib/Bcfg2/Server/Plugin/helpers.py
@@ -757,9 +757,6 @@ class StructFile(XMLFileBacked):
                                                                     err))
 
         if HAS_CRYPTO and self.encryption:
-            lax_decrypt = self.xdata.get(
-                "lax_decryption",
-                str(Bcfg2.Options.setup.lax_decryption)).lower() == "true"
             for el in self.xdata.xpath("//*[@encrypted]"):
                 try:
                     el.text = self._decrypt(el).encode('ascii',
@@ -768,10 +765,14 @@ class StructFile(XMLFileBacked):
                     self.logger.info("%s: Decrypted %s to gibberish, skipping"
                                      % (self.name, el.tag))
                 except Bcfg2.Server.Encryption.EVPError:
+                    lax_decrypt = self.xdata.get(
+                        "lax_decryption",
+                        str(Bcfg2.Options.setup.lax_decryption)).lower() == \
+                        "true"
                     msg = "Failed to decrypt %s element in %s" % (el.tag,
                                                                   self.name)
                     if lax_decrypt:
-                        self.logger.warning(msg)
+                        self.logger.debug(msg)
                     else:
                         raise PluginExecutionError(msg)
     Index.__doc__ = XMLFileBacked.Index.__doc__
@@ -783,16 +784,11 @@ class StructFile(XMLFileBacked):
         passes = Bcfg2.Options.setup.passphrases
         try:
             passphrase = passes[element.get("encrypted")]
-            try:
-                return Bcfg2.Server.Encryption.ssl_decrypt(element.text,
-                                                           passphrase)
-            except Bcfg2.Server.Encryption.EVPError:
-                # error is raised below
-                pass
+            return Bcfg2.Server.Encryption.ssl_decrypt(element.text,
+                                                       passphrase)
         except KeyError:
-            # bruteforce_decrypt raises an EVPError with a sensible
-            # error message, so we just let it propagate up the stack
-            return Bcfg2.Server.Encryption.bruteforce_decrypt(element.text)
+            raise Bcfg2.Server.Encryption.EVPError("No passphrase named '%s'" %
+                                                   element.get("encrypted"))
         raise Bcfg2.Server.Encryption.EVPError("Failed to decrypt")
 
     def _include_element(self, item, metadata, *args):
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py
index e2a2f696a..ae93fae4a 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py
@@ -1,6 +1,7 @@
 """ CfgEncryptedGenerator lets you encrypt your plaintext
 :ref:`server-plugins-generators-cfg` files on the server. """
 
+import Bcfg2.Options
 from Bcfg2.Server.Plugin import PluginExecutionError
 from Bcfg2.Server.Plugins.Cfg import CfgGenerator
 try:
@@ -25,7 +26,6 @@ class CfgEncryptedGenerator(CfgGenerator):
         CfgGenerator.__init__(self, fname, spec)
         if not HAS_CRYPTO:
             raise PluginExecutionError("M2Crypto is not available")
-    __init__.__doc__ = CfgGenerator.__init__.__doc__
 
     def handle_event(self, event):
         CfgGenerator.handle_event(self, event)
@@ -35,11 +35,14 @@ class CfgEncryptedGenerator(CfgGenerator):
         try:
             self.data = bruteforce_decrypt(self.data)
         except EVPError:
-            raise PluginExecutionError("Failed to decrypt %s" % self.name)
-    handle_event.__doc__ = CfgGenerator.handle_event.__doc__
+            msg = "Cfg: Failed to decrypt %s" % self.name
+            print "lax decrypt: %s" % Bcfg2.Options.setup.lax_decryption
+            if Bcfg2.Options.setup.lax_decryption:
+                self.logger.debug(msg)
+            else:
+                raise PluginExecutionError(msg)
 
     def get_data(self, entry, metadata):
         if self.data is None:
             raise PluginExecutionError("Failed to decrypt %s" % self.name)
         return CfgGenerator.get_data(self, entry, metadata)
-    get_data.__doc__ = CfgGenerator.get_data.__doc__
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py
index e9698f526..8cc3f7b21 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py
@@ -34,7 +34,6 @@ class CfgPrivateKeyCreator(XMLCfgCreator):
         pubkey_name = os.path.join(pubkey_path, os.path.basename(pubkey_path))
         self.pubkey_creator = CfgPublicKeyCreator(pubkey_name)
         self.cmd = Executor()
-    __init__.__doc__ = XMLCfgCreator.__init__.__doc__
 
     def _gen_keypair(self, metadata, spec=None):
         """ Generate a keypair according to the given client medata
diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py
index bf51ff678..4c1c31307 100644
--- a/src/lib/Bcfg2/Server/Plugins/Metadata.py
+++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py
@@ -1477,7 +1477,7 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
             # want detailed numbers of added/removed clients for
             # logging
             for client in added.union(removed):
-                self.expire_cache(client)
+                self.cache.expire(client)
 
     def start_client_run(self, metadata):
         """ Hook to reread client list if the database is in use """
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
index 3cfda9e9c..2dc44d0c4 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
@@ -63,7 +63,7 @@ import Bcfg2.Server.Plugin
 import Bcfg2.Server.FileMonitor
 from lockfile import FileLock
 from Bcfg2.Utils import Executor
-from distutils.spawn import find_executable
+from distutils.spawn import find_executable  # pylint: disable=E0611
 # pylint: disable=W0622
 from Bcfg2.Compat import StringIO, cPickle, HTTPError, URLError, \
     ConfigParser, any
@@ -347,8 +347,8 @@ class YumCollection(Collection):
         config file to see if it has been explicitly specified; next
         we see if it's in $PATH; finally we default to /usr/sbin, the
         default location. """
+        # pylint: disable=W0212
         if not self._helper:
-            # pylint: disable=W0212
             self.__class__._helper = Bcfg2.Options.setup.yum_helper
             if not self.__class__._helper:
                 # first see if bcfg2-yum-helper is in PATH
@@ -416,6 +416,25 @@ class YumCollection(Collection):
 
             yumconf.write(open(self.cfgfile, 'w'))
 
+    def get_arch(self):
+        """ If 'arch' for each source is the same, return that arch, otherwise
+        None.
+
+        This helps bcfg2-yum-helper when the client arch is
+        incompatible with the bcfg2 server's arch.
+
+        In case multiple arches are found, punt back to the default behavior.
+        """
+        arches = set()
+        for source in self:
+            for url_map in source.url_map:
+                if url_map['arch'] in self.metadata.groups:
+                    arches.add(url_map['arch'])
+        if len(arches) == 1:
+            return arches.pop()
+        else:
+            return None
+
     def get_config(self, raw=False):  # pylint: disable=W0221
         """ Get the yum configuration for this collection.
 
@@ -871,10 +890,12 @@ class YumCollection(Collection):
 
         if packagelist:
             try:
-                result = self.call_helper(
-                    "complete",
-                    dict(packages=list(packagelist),
-                         groups=list(self.get_relevant_groups())))
+                helper_dict = dict(packages=list(packagelist),
+                                   groups=list(self.get_relevant_groups()))
+                arch = self.get_arch()
+                if arch is not None:
+                    helper_dict['arch'] = arch
+                result = self.call_helper("complete", helper_dict)
             except ValueError:
                 # error reported by call_helper()
                 return set(), packagelist
diff --git a/src/lib/Bcfg2/Server/Plugins/Properties.py b/src/lib/Bcfg2/Server/Plugins/Properties.py
index 04314218c..28400f6d2 100644
--- a/src/lib/Bcfg2/Server/Plugins/Properties.py
+++ b/src/lib/Bcfg2/Server/Plugins/Properties.py
@@ -163,7 +163,6 @@ class XMLPropertyFile(Bcfg2.Server.Plugin.StructFile, PropertyFile):
         Bcfg2.Server.Plugin.StructFile.__init__(self, name,
                                                 should_monitor=should_monitor)
         PropertyFile.__init__(self, name)
-    __init__.__doc__ = Bcfg2.Server.Plugin.StructFile.__init__.__doc__
 
     def _write(self):
         open(self.name, "wb").write(
@@ -171,7 +170,6 @@ class XMLPropertyFile(Bcfg2.Server.Plugin.StructFile, PropertyFile):
                                 xml_declaration=False,
                                 pretty_print=True).decode('UTF-8'))
         return True
-    _write.__doc__ = PropertyFile._write.__doc__
 
     def validate_data(self):
         """ ensure that the data in this object validates against the
@@ -194,7 +192,6 @@ class XMLPropertyFile(Bcfg2.Server.Plugin.StructFile, PropertyFile):
                                        self.name)
         else:
             return True
-    validate_data.__doc__ = PropertyFile.validate_data.__doc__
 
     def get_additional_data(self, metadata):
         if Bcfg2.Options.setup.automatch:
diff --git a/src/lib/Bcfg2/Server/Plugins/Svn.py b/src/lib/Bcfg2/Server/Plugins/Svn.py
index b2a16e52e..b752650f0 100644
--- a/src/lib/Bcfg2/Server/Plugins/Svn.py
+++ b/src/lib/Bcfg2/Server/Plugins/Svn.py
@@ -20,8 +20,8 @@ class Svn(Bcfg2.Server.Plugin.Version):
         Bcfg2.Options.Option(
             cf=("svn", "conflict_resolution"), dest="svn_conflict_resolution",
             type=lambda v: v.replace("-", "_"),
-            choices=dir(pysvn.wc_conflict_choice),
-            default=pysvn.wc_conflict_choice.postpone,
+            choices=dir(pysvn.wc_conflict_choice),  # pylint: disable=E1101
+            default=pysvn.wc_conflict_choice.postpone,  # pylint: disable=E1101
             help="SVN conflict resolution method"),
         Bcfg2.Options.Option(
             cf=("svn", "user"), dest="svn_user", help="SVN username"),