From: Luca Boccassi Date: Sat, 27 Aug 2022 23:05:16 +0000 (+0100) Subject: Compression: do not append '.False' as suffix to verity files when compression is... X-Git-Tag: v14~54^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1e45d5bf1629747d8fa1fa01fa680ca89722883;p=thirdparty%2Fmkosi.git Compression: do not append '.False' as suffix to verity files when compression is disabled Output Split Root FS: /home/luca/git/mkosi/mkosi.output/debian~unstable/image.root.False Output Split Verity: /home/luca/git/mkosi/mkosi.output/debian~unstable/image.verity.False Output Split Verity Sig.: /home/luca/git/mkosi/mkosi.output/debian~unstable/image.verity-sig.False --- diff --git a/mkosi/__init__.py b/mkosi/__init__.py index d113243a6..b55c388d4 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py @@ -6285,7 +6285,8 @@ def xescape(s: str) -> str: def build_auxiliary_output_path(args: Union[argparse.Namespace, MkosiArgs], suffix: str, can_compress: bool = False) -> Path: output = strip_suffixes(args.output) - compression = f".{should_compress_output(args)}" if can_compress else '' + should_compress = should_compress_output(args) + compression = f".{should_compress}" if can_compress and should_compress else '' return output.with_name(f"{output.name}{suffix}{compression}")