[PATCH 2/5] honor tag['extra']['mock.package_manager']

Mike McLean mikem at redhat.com
Wed Jun 17 19:33:08 UTC 2015


---
 builder/kojid    | 2 ++
 koji/__init__.py | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/builder/kojid b/builder/kojid
index b6b79c1..5b9d66b 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -239,6 +239,8 @@ class BuildRoot(object):
         opts['maven_envs'] = self.maven_envs
         opts['bind_opts'] = self.bind_opts
         opts['target_arch'] = self.target_arch
+        if 'mock.package_manager' in self.config['extra']:
+            opts['package_manager'] = self.config['extra']['mock.package_manager']
         output = koji.genMockConfig(self.name, self.br_arch, managed=True, **opts)
 
         #write config
diff --git a/koji/__init__.py b/koji/__init__.py
index 58971da..c0d5a30 100644
--- a/koji/__init__.py
+++ b/koji/__init__.py
@@ -1286,6 +1286,8 @@ def genMockConfig(name, arch, managed=False, repoid=None, tag_name=None, **opts)
         # Don't let a build last more than 24 hours
         'rpmbuild_timeout': opts.get('rpmbuild_timeout', 86400)
     }
+    if opts.get('package_manager'):
+        config_opts['package_manager'] = opts['package_manager']
 
     # bind_opts are used to mount parts (or all of) /dev if needed.
     # See kojid::LiveCDTask for a look at this option in action.
-- 
1.9.3



More information about the koji-devel mailing list