From cdb701d525aa7d86ed977d83ae314a54d20312b2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 29 May 2019 11:35:25 +0200 Subject: [PATCH] Allow configuring 'dynamic_buildrequires' The default is not set because we want to use koji's default if modulemd does not specify 'dynamic_buildrequires'. Requires: https://pagure.io/koji/pull-request/1466 Closes: https://pagure.io/fm-orchestrator/issue/1264 Signed-off-by: Igor Gnatenko --- module_build_service/builder/KojiModuleBuilder.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/module_build_service/builder/KojiModuleBuilder.py b/module_build_service/builder/KojiModuleBuilder.py index 955bf10c..2f82b7ce 100644 --- a/module_build_service/builder/KojiModuleBuilder.py +++ b/module_build_service/builder/KojiModuleBuilder.py @@ -542,8 +542,9 @@ class KojiModuleBuilder(GenericBuilder): # there might be some unblocked packages later and we would block them again... if not build_tag_exists: xmd = self.mmd.get_xmd() - if "blocked_packages" in xmd.get("mbs_options", {}): - self._koji_block_packages(xmd["mbs_options"]["blocked_packages"]) + mbs_opts = xmd.get("mbs_options", {}) + if "blocked_packages" in mbs_opts: + self._koji_block_packages(mbs_opts["blocked_packages"]) @module_build_service.utils.retry(wait_on=SysCallError, interval=5) def add_groups(): @@ -1008,8 +1009,11 @@ class KojiModuleBuilder(GenericBuilder): opts["extra"] = copy.deepcopy(conf.koji_tag_extra_opts) xmd = self.mmd.get_xmd() - if "repo_include_all" in xmd.get("mbs_options", {}): - opts["extra"]["repo_include_all"] = xmd["mbs_options"]["repo_include_all"] + mbs_opts = xmd.get("mbs_options", {}) + if "repo_include_all" in mbs_opts: + opts["extra"]["repo_include_all"] = mbs_opts["repo_include_all"] + if "dynamic_buildrequires" in mbs_opts: + opts["extra"]["dynamic_buildrequires"] = mbs_opts["dynamic_buildrequires"] # edit tag with opts self.koji_session.editTag2(tag_name, **opts)