Introduce name() method for MkosiConfig

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index bf23e18b492c5791492a99fa4e83d5225d24a49c..257d88fd13a00a588ad0353e7f217fce26fe2c90 100644 (file)
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -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),

diff --git a/mkosi/config.py b/mkosi/config.py
index 2ebae4492d8ebf6ae6598d775120912314219b22..e11ab9a3c8727069ba3975599a2a170b8ee208ab 100644 (file)
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -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()