Merge pull request #164 from zultron/maint

Enable bcfg2-yum-helper to depsolve for arches incompatible with server

2 files changed, 34 insertions, 4 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
index 67ff05ca1..6139a28b5 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
@@ -429,6 +429,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.
 
@@ -886,10 +905,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/sbin/bcfg2-yum-helper b/src/sbin/bcfg2-yum-helper
index 227d977de..dc6a6cc0b 100755
--- a/src/sbin/bcfg2-yum-helper
+++ b/src/sbin/bcfg2-yum-helper
@@ -62,6 +62,10 @@ class YumHelper(object):
         # pylint: enable=E1121,W0212
         self.logger = logging.getLogger(self.__class__.__name__)
 
+    def setarch(self, arch):
+        """ Configure an arch other than the bcfg2 server arch for dep
+        resolution. """
+        self.yumbase.arch.setup_arch(arch=arch)
 
 class DepSolver(YumHelper):
     """ Yum dependency solver.  This is used for operations that only
@@ -326,6 +330,11 @@ def main():
                          sys.exc_info()[1])
             rv = 2
         try:
+            # if provided, set client arch for dependency resolution
+            arch = data.get('arch', None)
+            if arch is not None:
+                depsolver.setarch(arch)
+
             depsolver.groups = data['groups']
             (packages, unknown) = depsolver.complete(
                 [pkg_to_tuple(p) for p in data['packages']])