From d991d8779b12f3bd43b40eaa50887008e0d580af Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Tue, 17 Sep 2024 22:20:33 +0100 Subject: build: T6653: fix a manifest generation error when using --reuse-iso --- scripts/image-build/build-vyos-image | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index 566c6a8b..8b2c0aa8 100755 --- a/scripts/image-build/build-vyos-image +++ b/scripts/image-build/build-vyos-image @@ -355,10 +355,18 @@ if __name__ == "__main__": # not to the vyos-build repository root. os.chdir(defaults.BUILD_DIR) + ## Initialize build manifest + manifest = { + 'build_config' : build_config, + 'artifacts' : [], + 'pre_build_config' : pre_build_config + } + iso_file = None if build_config["reuse_iso"]: iso_file = build_config["reuse_iso"] + manifest["artifacts"] = [iso_file] else: ## Create the version file @@ -548,13 +556,6 @@ if __name__ == "__main__": with open(file_path, 'w') as f: f.write(build_config["default_config"]) - ## Initialize build manifest - manifest = { - 'build_config' : build_config, - 'artifacts' : [iso_file], - 'pre_build_config' : pre_build_config - } - ## Configure live-build lb_config_tmpl = jinja2.Template(""" lb config noauto \ -- cgit v1.2.3