]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Introduce name() method for MkosiConfig
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Sun, 3 Dec 2023 10:57:40 +0000 (11:57 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Mon, 4 Dec 2023 13:21:46 +0000 (14:21 +0100)
mkosi/__init__.py
mkosi/config.py

index bf23e18b492c5791492a99fa4e83d5225d24a49c..257d88fd13a00a588ad0353e7f217fce26fe2c90 100644 (file)
@@ -2866,7 +2866,7 @@ def run_verb(args: MkosiArgs, images: Sequence[MkosiConfig]) -> None:
             continue
 
         with (
-            complete_step(f"Building {config.image or 'default'} image"),
+            complete_step(f"Building {config.name()} image"),
             mount_tools(config.tools_tree),
             hide_host_directories(),
             prepend_to_environ_path(config),
index 2ebae4492d8ebf6ae6598d775120912314219b22..e11ab9a3c8727069ba3975599a2a170b8ee208ab 100644 (file)
@@ -943,6 +943,9 @@ class MkosiConfig:
 
     image: Optional[str]
 
+    def name(self) -> str:
+        return self.image_id or self.image or "default"
+
     def output_dir_or_cwd(self) -> Path:
         return self.output_dir or Path.cwd()