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

6 files changed, 37 insertions, 17 deletions

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"),