From c0bc73fdc0dd943e2c43d8f3d0c1e949f2d6b3f9 Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Mon, 17 Jul 2023 16:14:57 +0200 Subject: [PATCH] disable use_bootstrap_image if not requested Related: https://pagure.io/koji/issue/3872 --- cli/koji_cli/commands.py | 2 ++ koji/__init__.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cli/koji_cli/commands.py b/cli/koji_cli/commands.py index 69b262d7..bbcab1f7 100644 --- a/cli/koji_cli/commands.py +++ b/cli/koji_cli/commands.py @@ -1174,6 +1174,8 @@ def anon_handle_mock_config(goptions, session, args): if 'mock.bootstrap_image' in buildcfg['extra']: opts['use_bootstrap_image'] = True opts['bootstrap_image'] = buildcfg['extra']['mock.bootstrap_image'] + else: + opts['use_bootstrap_image'] = False if 'mock.use_bootstrap' in buildcfg['extra']: opts['use_bootstrap'] = buildcfg['extra']['mock.use_bootstrap'] if 'mock.module_setup_commands' in buildcfg['extra']: diff --git a/koji/__init__.py b/koji/__init__.py index 37fb4286..cd8f91fb 100644 --- a/koji/__init__.py +++ b/koji/__init__.py @@ -1815,6 +1815,8 @@ def genMockConfig(name, arch, managed=False, repoid=None, tag_name=None, **opts) if opts.get('bootstrap_image'): config_opts['use_bootstrap_image'] = True config_opts['bootstrap_image'] = opts['bootstrap_image'] + else: + config_opts['use_bootstrap_image'] = False if 'use_bootstrap' in opts: config_opts['use_bootstrap'] = bool(opts['use_bootstrap']) if 'module_setup_commands' in opts: