Merge pull request #766 from dmbaturin/manifest-reuse-iso

build: T6653: fix a manifest generation error when using --reuse-iso
vyos · Sep 18, 2024 · ead4cc2 · ead4cc2
2 parents 2a53f21 + d991d87
commit ead4cc2
Showing 1 changed file with 8 additions and 7 deletions.
diff --git 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 \