From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 3 Dec 2023 10:57:40 +0000 (+0100)
Subject: Introduce name() method for MkosiConfig
X-Git-Tag: v20~114^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50600eadb81577b60f4ea61dad54016569c4218d;p=thirdparty%2Fmkosi.git

Introduce name() method for MkosiConfig
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index bf23e18b4..257d88fd1 100644
--- 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 2ebae4492..e11ab9a3c 100644
--- 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()