From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 30 Sep 2024 12:22:59 +0000 (+0200)
Subject: Set up rpm before dnf/zypper
X-Git-Tag: v25~254^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1a0078d9a676285b189cea899dae829a0e5018e;p=thirdparty%2Fmkosi.git

Set up rpm before dnf/zypper
---

diff --git a/mkosi/distributions/azure.py b/mkosi/distributions/azure.py
index 77ca1dc9e..84df21e1c 100644
--- a/mkosi/distributions/azure.py
+++ b/mkosi/distributions/azure.py
@@ -28,8 +28,8 @@ class Installer(fedora.Installer):
 
     @classmethod
     def setup(cls, context: Context) -> None:
-        Dnf.setup(context, list(cls.repositories(context)), filelists=False)
         setup_rpm(context, dbpath="/var/lib/rpm")
+        Dnf.setup(context, list(cls.repositories(context)), filelists=False)
 
     @classmethod
     def install(cls, context: Context) -> None:
diff --git a/mkosi/distributions/centos.py b/mkosi/distributions/centos.py
index 75ef35c71..bacc2f094 100644
--- a/mkosi/distributions/centos.py
+++ b/mkosi/distributions/centos.py
@@ -65,9 +65,10 @@ class Installer(DistributionInstaller):
         if GenericVersion(context.config.release) <= 8:
             die(f"{cls.pretty_name()} Stream 8 or earlier variants are not supported")
 
+        setup_rpm(context, dbpath=cls.dbpath(context))
+
         Dnf.setup(context, list(cls.repositories(context)))
         (context.sandbox_tree / "etc/dnf/vars/stream").write_text(f"{context.config.release}-stream\n")
-        setup_rpm(context, dbpath=cls.dbpath(context))
 
     @classmethod
     def install(cls, context: Context) -> None:
diff --git a/mkosi/distributions/fedora.py b/mkosi/distributions/fedora.py
index c79302fe8..12f71c061 100644
--- a/mkosi/distributions/fedora.py
+++ b/mkosi/distributions/fedora.py
@@ -100,8 +100,8 @@ class Installer(DistributionInstaller):
 
     @classmethod
     def setup(cls, context: Context) -> None:
-        Dnf.setup(context, list(cls.repositories(context)), filelists=False)
         setup_rpm(context)
+        Dnf.setup(context, list(cls.repositories(context)), filelists=False)
 
     @classmethod
     def install(cls, context: Context) -> None:
diff --git a/mkosi/distributions/opensuse.py b/mkosi/distributions/opensuse.py
index fbbd7b465..eab65f1ef 100644
--- a/mkosi/distributions/opensuse.py
+++ b/mkosi/distributions/opensuse.py
@@ -49,14 +49,14 @@ class Installer(DistributionInstaller):
 
     @classmethod
     def setup(cls, context: Context) -> None:
+        setup_rpm(context)
+
         zypper = context.config.find_binary("zypper")
         if zypper:
             Zypper.setup(context, list(cls.repositories(context)))
         else:
             Dnf.setup(context, list(cls.repositories(context)))
 
-        setup_rpm(context)
-
     @classmethod
     def install(cls, context: Context) -> None:
         cls.install_packages(context, ["filesystem"], apivfs=False)