From: Michael Ferrari <nekkodroid404@gmail.com>
Date: Sat, 22 Jun 2024 09:38:23 +0000 (+0200)
Subject: Skip directories when generating checksums
X-Git-Tag: v24~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f8a2d1a1265deba12212a48cc68df6a087822f2;p=thirdparty%2Fmkosi.git

Skip directories when generating checksums

It is possible that some directory is created by the user in
`mkosi.postoutput`, so just make sure to skip those as they can't be
hashed.

Also remove the check for directory output type as auxiliary files may
be created that should be hashed.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index aa0b4b60b..8545ed095 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2653,12 +2653,13 @@ def calculate_sha256sum(context: Context) -> None:
     if not context.config.checksum:
         return
 
-    if context.config.output_format == OutputFormat.directory:
-        return
-
     with complete_step("Calculating SHA256SUMS…"):
         with open(context.workspace / context.config.output_checksum, "w") as f:
             for p in context.staging.iterdir():
+                if p.is_dir():
+                    logging.warning(f"Cannot checksum directory '{p}', skipping")
+                    continue
+
                 print(hash_file(p) + " *" + p.name, file=f)
 
         (context.workspace / context.config.output_checksum).rename(context.staging / context.config.output_checksum)
@@ -2668,9 +2669,6 @@ def calculate_signature(context: Context) -> None:
     if not context.config.sign or not context.config.checksum:
         return
 
-    if context.config.output_format == OutputFormat.directory:
-        return
-
     cmdline: list[PathString] = ["gpg", "--detach-sign"]
 
     # Need to specify key before file to sign