#1459 Include images info in composeinfo.json
Merged 3 years ago by lsedlar. Opened 3 years ago by hlin.
hlin/pungi master  into  master

file modified
+7
@@ -156,6 +156,13 @@ 

                  var.paths.isos[arch] = relative_path(

                      iso_dir, compose.paths.compose.topdir().rstrip("/") + "/"

                  ).rstrip("/")

+             image_dir = compose.paths.compose.image_dir(variant=variant) or ""

+             if image_dir:

+                 image_dir = image_dir % {"arch": arch}

+                 if os.path.isdir(image_dir):

+                     var.paths.images[arch] = relative_path(

+                         image_dir, compose.paths.compose.topdir().rstrip("/") + "/"

+                     ).rstrip("/")

              jigdo_dir = (

                  compose.paths.compose.jigdo_dir(

                      arch=arch, variant=variant, create_dir=False

This looks good to me. The entire function is quite messy and would deserve some cleanup, but that shouldn't be part of this PR anyway.

Pull-Request has been merged by lsedlar

3 years ago
Metadata