]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Drop compression suffix for directory output
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 10 Nov 2023 12:18:05 +0000 (13:18 +0100)
committerJörg Behrmann <behrmann@physik.fu-berlin.de>
Sat, 11 Nov 2023 08:22:44 +0000 (09:22 +0100)
The automatic logic would produce a name like "initrd_6.6.0.zst", even though
there is no compression.

mkosi/config.py

index 9dde626e20bc038b50dcbccaed8b73603f3f6306..2da446fb2374b5415a0a52e02cb6190079398488 100644 (file)
@@ -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