]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
centos: Change local rpm GPG key location
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 13 Jun 2024 19:38:39 +0000 (21:38 +0200)
committerJörg Behrmann <behrmann@physik.fu-berlin.de>
Thu, 13 Jun 2024 20:42:22 +0000 (22:42 +0200)
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.

mkosi/distributions/centos.py

index 5041ec9350ce5bab3aeb4a3d6675b6de9dae301c..a85f0d9413b1405b418ab76d5c8e048a8b2e81ae 100644 (file)
@@ -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