From dbc78d089bcb46bca427c49bacc3f2443b229611 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Thu, 3 Nov 2022 12:43:51 -0400 Subject: T4796: fix argument order in merging default and custom options in buils-vyos-image --- scripts/build-vyos-image | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/build-vyos-image b/scripts/build-vyos-image index 1406aec..9bb48ed 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: -- cgit v1.2.3