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

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 0b0337f56d4c59c5a859c0dd869aeb530900e330..efbd57b828fedbbaddf88b6bd48fca5519672278 100644 (file)
--- 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"