From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 6 Dec 2021 11:30:08 +0000 (+0100)
Subject: fedora: Fedora >= 35 don't use short key IDs anymore
X-Git-Tag: v13~103^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f3c2cd104d297fd0b27e3dcd10351657550c84a;p=thirdparty%2Fmkosi.git

fedora: Fedora >= 35 don't use short key IDs anymore
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 0b0337f56..efbd57b82 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2248,9 +2248,13 @@ def install_fedora(args: CommandLineArguments, root: Path, do_run_build_script:
         )
 
     if args.releasever in FEDORA_KEYS_MAP:
-        # The website uses short identifiers: https://pagure.io/fedora-web/websites/issue/196
-        shortid = FEDORA_KEYS_MAP[args.releasever][-8:]
-        gpgid = f"keys/{shortid}.txt"
+        key = FEDORA_KEYS_MAP[args.releasever]
+
+        # The website uses short identifiers for Fedora < 35: https://pagure.io/fedora-web/websites/issue/196
+        if int(args.releasever) < 35:
+            key = FEDORA_KEYS_MAP[args.releasever][-8:]
+
+        gpgid = f"keys/{key}.txt"
     else:
         gpgid = "fedora.gpg"