From: Michael A Cassaniti <michael@cassaniti.id.au>
Date: Wed, 26 Apr 2023 04:27:04 +0000 (+1000)
Subject: hash signing: Fix using default key
X-Git-Tag: v15~193^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf2fa5dcd5f3f2e2091edb04e6ba97ae65a2f2cb;p=thirdparty%2Fmkosi.git

hash signing: Fix using default key

The default key needs to be specified before the file to sign
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index f554f2553..6cddc2dc4 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -837,16 +837,17 @@ def calculate_signature(state: MkosiState) -> None:
         return None
 
     with complete_step("Signing SHA256SUMS…"):
-        cmdline: list[PathString] = [
-            "gpg",
-            "--detach-sign",
-            "-o", state.staging / state.config.output_signature.name,
-            state.staging / state.config.output_checksum.name,
-        ]
+        cmdline: list[PathString] = ["gpg", "--detach-sign"]
 
+        # Need to specify key before file to sign
         if state.config.key is not None:
             cmdline += ["--default-key", state.config.key]
 
+        cmdline += [
+            "--output", state.staging / state.config.output_signature.name,
+            state.staging / state.config.output_checksum.name,
+        ]
+
         run(cmdline)