diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-11-03 18:01:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-03 18:01:51 +0100 |
| commit | a0f9b0267d84c4f6571224b996ca160792dec6e6 (patch) | |
| tree | a3f5bffc7e07645034492e2f225e9d2aecb336e2 | |
| parent | 5ca6ee4d7cbb13c6f2a28d070bb55c47d019bf47 (diff) | |
| parent | dbc78d089bcb46bca427c49bacc3f2443b229611 (diff) | |
| download | vyos-build-a0f9b0267d84c4f6571224b996ca160792dec6e6.tar.gz vyos-build-a0f9b0267d84c4f6571224b996ca160792dec6e6.zip | |
Merge pull request #275 from dmbaturin/flavor-version-string
T4796: fix argument order in merging default and custom options in buils-vyos-image
| -rwxr-xr-x | scripts/build-vyos-image | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/build-vyos-image b/scripts/build-vyos-image index 1406aec9..9bb48ed1 100755 --- a/scripts/build-vyos-image +++ b/scripts/build-vyos-image @@ -215,7 +215,7 @@ if __name__ == "__main__": args['pbuilder_config'] = os.path.join(defaults.BUILD_DIR, defaults.PBUILDER_CONFIG) ## Combine the arguments with non-configurable defaults - build_config = merge_dicts(build_defaults, args) + build_config = merge_dicts(args, build_defaults) ## Load the flavor file and mix-ins with open(make_toml_path(defaults.BUILD_TYPES_DIR, build_config["build_type"]), 'r') as f: |