From e780a611a6925dc9db4fe9addaa31d01b8b35cfb Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Feb 28 2018 13:19:29 +0000 Subject: make internal_dev_setup an option in getMockConfig --- diff --git a/koji/__init__.py b/koji/__init__.py index 192f51b..1c593c8 100644 --- a/koji/__init__.py +++ b/koji/__init__.py @@ -1538,13 +1538,17 @@ name=build parts.append("\n") if bind_opts: - # This line is REQUIRED for mock to work if bind_opts defined. - parts.append("config_opts['internal_dev_setup'] = False\n") + # disable internal_dev_setup unless opts explicitly say otherwise + opts.setdefault('internal_dev_setup', False) for key in bind_opts.keys(): for mnt_src, mnt_dest in six.iteritems(bind_opts.get(key)): parts.append("config_opts['plugin_conf']['bind_mount_opts'][%r].append((%r, %r))\n" % (key, mnt_src, mnt_dest)) parts.append("\n") + if 'internal_dev_setup' in opts: + parts.append("config_opts['internal_dev_setup'] = %r\n" + % bool(opts['internal_dev_setup'])) + for key, value in six.iteritems(macros): parts.append("config_opts['macros'][%r] = %r\n" % (key, value)) parts.append("\n")