Use find_rpm_gpgkey() for Mageia and OpenMandriva

diff --git a/mkosi/distributions/mageia.py b/mkosi/distributions/mageia.py
index b6028fe9a3d39b9dc18b441d64ef206c0e63dcf7..94cdb3a649a6276c3386bfbe769057a9c27a79f6 100644 (file)
--- a/mkosi/distributions/mageia.py
+++ b/mkosi/distributions/mageia.py
@@ -5,7 +5,7 @@ from collections.abc import Sequence
 
 from mkosi.architecture import Architecture
 from mkosi.distributions import Distribution, DistributionInstaller, PackageType
-from mkosi.installer.dnf import Repo, invoke_dnf, setup_dnf
+from mkosi.installer.dnf import Repo, find_rpm_gpgkey, invoke_dnf, setup_dnf
 from mkosi.log import die
 from mkosi.state import MkosiState
 
@@ -54,7 +54,11 @@ class Installer(DistributionInstaller):
             else:
                 updates_url = f"mirrorlist={baseurl}&repo=updates"
 
-        gpgurl = f"https://mirrors.kernel.org/mageia/distrib/{release}/{arch}/media/core/release/media_info/pubkey"
+        gpgurl = find_rpm_gpgkey(
+            state,
+            "RPM-GPG-KEY-Mageia",
+            f"https://mirrors.kernel.org/mageia/distrib/{release}/{arch}/media/core/release/media_info/pubkey",
+        )
 
         repos = [Repo(f"mageia-{release}", release_url, (gpgurl,))]
         if updates_url is not None:

diff --git a/mkosi/distributions/openmandriva.py b/mkosi/distributions/openmandriva.py
index ee7aaacc4232c8fa8fb13204bc7d8b774508d880..4dd4054462e318ac74a5f0481b6843edf97cee7e 100644 (file)
--- a/mkosi/distributions/openmandriva.py
+++ b/mkosi/distributions/openmandriva.py
@@ -5,7 +5,7 @@ from collections.abc import Sequence
 
 from mkosi.architecture import Architecture
 from mkosi.distributions import Distribution, DistributionInstaller, PackageType
-from mkosi.installer.dnf import Repo, invoke_dnf, setup_dnf
+from mkosi.installer.dnf import Repo, find_rpm_gpgkey, invoke_dnf, setup_dnf
 from mkosi.log import die
 from mkosi.state import MkosiState
 
@@ -52,7 +52,11 @@ class Installer(DistributionInstaller):
             release_url = f"baseurl={baseurl}/release/"
             updates_url = f"baseurl={baseurl}/updates/"
 
-        gpgurl = "https://raw.githubusercontent.com/OpenMandrivaAssociation/openmandriva-repos/master/RPM-GPG-KEY-OpenMandriva"
+        gpgurl = find_rpm_gpgkey(
+            state,
+            "RPM-GPG-KEY-OpenMandriva",
+            "https://raw.githubusercontent.com/OpenMandrivaAssociation/openmandriva-repos/master/RPM-GPG-KEY-OpenMandriva",
+        )
 
         repos = [Repo("openmandriva", release_url, (gpgurl,))]
         if updates_url is not None: