diff --git a/shrinkwrap/commands/buildall.py b/shrinkwrap/commands/buildall.py index a7677d0f313fa6b099f76b4255371c09f8365f2f..d5219ccf4ede17e1b45bcbf7a7ad341019bfe9d9 100644 --- a/shrinkwrap/commands/buildall.py +++ b/shrinkwrap/commands/buildall.py @@ -60,10 +60,10 @@ def add_common_args(cmdp): metavar='cfgfile', required=False, default=[], action='append', help="""Optional config file overlay to override run-time and - build-time settings. Only entries within the "build" and - "run" sections are used. Applied to all configs being - built. Can be specified multiple times; left-most overlay - is the first overlay applied.""") + build-time settings. Only entries within the "build", + "buildex" and "run" sections are used. Applied to all + configs being built. Can be specified multiple times; + left-most overlay is the first overlay applied.""") cmdp.add_argument('-t', '--tasks', required=False, default=dflt_jobs(), metavar='count', type=int, diff --git a/shrinkwrap/commands/clean.py b/shrinkwrap/commands/clean.py index 6dd217212ff44532c0b96f300e3e160007e08aee..8089c07def06684d3bbb6e3a0e7bb00904ea1ba5 100644 --- a/shrinkwrap/commands/clean.py +++ b/shrinkwrap/commands/clean.py @@ -39,10 +39,10 @@ def add_parser(parser, formatter): metavar='cfgfile', required=False, default=[], action='append', help="""Optional config file overlay to override run-time and - build-time settings. Only entries within the "build" and - "run" sections are used. Applied to all configs being - built. Can be specified multiple times; left-most overlay - is the first overlay applied.""") + build-time settings. Only entries within the "build", + "buildex" and "run" sections are used. Applied to all + configs being built. Can be specified multiple times; + left-most overlay is the first overlay applied.""") cmdp.add_argument('-t', '--tasks', required=False, default=dflt_jobs(), metavar='count', type=int, diff --git a/shrinkwrap/commands/process.py b/shrinkwrap/commands/process.py index 046829af52d06e4d6e9e8460740cc8812111dd2b..3b9dddb3cba1d148692bcf5726b0ebbf115481a9 100644 --- a/shrinkwrap/commands/process.py +++ b/shrinkwrap/commands/process.py @@ -44,9 +44,10 @@ def add_parser(parser, formatter): metavar='cfgfile', required=False, default=[], action='append', help="""Optional config file overlay to override run-time and - build-time settings. Only entries within the "build" and - "run" sections are used. Can be specified multiple times; - left-most overlay is the first overlay applied.""") + build-time settings. Only entries within the "build", + "buildex" and "run" sections are used. Can be specified + multiple times; left-most overlay is the first overlay + applied.""") cmdp.add_argument('-b', '--btvar', metavar='key=value', required=False, default=[], @@ -79,7 +80,11 @@ def dispatch(args): for overlayname in args.overlay: overlay = config.filename(overlayname) overlay = config.load(overlay) - overlay = {'build': overlay['build'], 'run': overlay['run']} + overlay = { + 'build': overlay['build'], + 'buildex': overlay['buildex'], + 'run': overlay['run'], + } overlays.append(overlay) filename = config.filename(args.config) diff --git a/shrinkwrap/utils/config.py b/shrinkwrap/utils/config.py index d55086cc79dc254be391e5372ec3404cc355872f..46e190762e919c62df2b0afc3c04cb7df8f0ea91 100644 --- a/shrinkwrap/utils/config.py +++ b/shrinkwrap/utils/config.py @@ -719,7 +719,11 @@ def load_all(names, overlaynames=[]): for overlayname in overlaynames: overlay = filename(overlayname) overlay = load(overlay) - overlay = {'build': overlay['build'], 'run': overlay['run']} + overlay = { + 'build': overlay['build'], + 'buildex': overlay['buildex'], + 'run': overlay['run'], + } overlays.append(overlay) for name in names: