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

1 files changed, 27 insertions, 6 deletions

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