From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 13 Jun 2024 19:38:39 +0000 (+0200)
Subject: centos: Change local rpm GPG key location
X-Git-Tag: v24~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac086566fa776c6d1bd5f4df92e1c25523b047b9;p=thirdparty%2Fmkosi.git

centos: Change local rpm GPG key location

Let's look for the one suffixed with the release number. This doesn't
change behavior for c9s as this is a symlink to the file we looked for
previously but will fix our behavior for c10s which uses a different key.
---

diff --git a/mkosi/distributions/centos.py b/mkosi/distributions/centos.py
index 5041ec935..a85f0d941 100644
--- a/mkosi/distributions/centos.py
+++ b/mkosi/distributions/centos.py
@@ -102,7 +102,7 @@ class Installer(DistributionInstaller):
 
     @staticmethod
     def gpgurls(context: Context) -> tuple[str, ...]:
-        keys = ("RPM-GPG-KEY-CentOS-Official", "RPM-GPG-KEY-CentOS-SIG-Extras")
+        keys = (f"RPM-GPG-KEY-CentOS-{context.config.release}", "RPM-GPG-KEY-CentOS-SIG-Extras")
         return tuple(find_rpm_gpgkey(context, key) or f"https://www.centos.org/keys/{key}" for key in keys)
 
     @classmethod