From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 19 Oct 2023 16:54:02 +0000 (+0200)
Subject: Use find_rpm_gpgkey() for Mageia and OpenMandriva
X-Git-Tag: v19~60^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a61fe46ebe80f62e715a11d3e9ad675842cb88b2;p=thirdparty%2Fmkosi.git

Use find_rpm_gpgkey() for Mageia and OpenMandriva
---

diff --git a/mkosi/distributions/mageia.py b/mkosi/distributions/mageia.py
index b6028fe9a..94cdb3a64 100644
--- 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 ee7aaacc4..4dd405446 100644
--- 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: