From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 11 Feb 2024 07:47:14 +0000 (+0100)
Subject: Revert "Do not use underscore in image names"
X-Git-Tag: v21~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4156a78df062ab7bbbd0cf8ae94126105d0d2d1;p=thirdparty%2Fmkosi.git

Revert "Do not use underscore in image names"

This reverts commit 2fd8cda4316ebd80f25d2d54c9fd818c96b91060.

This breaks assumptions about DDI naming so let's revert this change.

Specifiers can be used instead to override the output naming.
---

diff --git a/mkosi/config.py b/mkosi/config.py
index 17fc77908..4f9ed5dbb 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -588,7 +588,7 @@ def config_default_output(namespace: argparse.Namespace) -> str:
     output = namespace.image_id or namespace.image or "image"
 
     if namespace.image_version:
-        output += f"-{namespace.image_version}"
+        output += f"_{namespace.image_version}"
 
     return output
 
diff --git a/tests/test_config.py b/tests/test_config.py
index 230dfd198..a06c0e37f 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -896,7 +896,7 @@ def test_output_id_version(tmp_path: Path) -> None:
     with chdir(d):
         _, [config] = parse_config()
 
-    assert config.output == "output-1.2.3"
+    assert config.output == "output_1.2.3"
 
 
 def test_deterministic() -> None: