particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

handle internal_dev_setup opt earlier

Browse source
This commit is contained in:
Mike McLean 2018-02-28 12:18:14 -05:00
parent c3e8a2ecc7
commit 3dda2f5dbf
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
koji/__init__.py
View file

@ -1529,6 +1529,13 @@ name=build
# Koji tag: %(tag_name)s
""" % locals())
if bind_opts:
# disable internal_dev_setup unless opts explicitly say otherwise
opts.setdefault('internal_dev_setup', False)
if 'internal_dev_setup' in opts:
config_opts['internal_dev_setup'] = opts['internal_dev_setup']
parts.append("\n")
for key in sorted(config_opts):
value = config_opts[key]
@ -1540,17 +1547,11 @@ name=build
parts.append("\n")
if bind_opts:
# 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 in sorted(macros):
value = macros[key]
parts.append("config_opts['macros'][%r] = %r\n" % (key, value))