From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 10 Nov 2023 12:18:05 +0000 (+0100)
Subject: Drop compression suffix for directory output
X-Git-Tag: v19~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2342a74bd06434fe2635e9aefddcf0b55c91209c;p=thirdparty%2Fmkosi.git

Drop compression suffix for directory output

The automatic logic would produce a name like "initrd_6.6.0.zst", even though
there is no compression.
---

diff --git a/mkosi/config.py b/mkosi/config.py
index 9dde626e2..2da446fb2 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -116,6 +116,11 @@ class OutputFormat(StrEnum):
             OutputFormat.uki:  ".efi",
         }.get(self, "")
 
+    def use_outer_compression(self) -> bool:
+        return self in (OutputFormat.tar,
+                        OutputFormat.cpio,
+                        OutputFormat.disk)
+
 
 class ManifestFormat(StrEnum):
     json      = enum.auto()  # the standard manifest in json format
@@ -972,7 +977,7 @@ class MkosiConfig:
     def output_with_compression(self) -> str:
         output = self.output_with_format
 
-        if self.compress_output and self.output_format not in (OutputFormat.uki, OutputFormat.esp):
+        if self.compress_output and self.output_format.use_outer_compression():
             output += f".{self.compress_output}"
 
         return output