From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sat, 13 Apr 2024 18:59:43 +0000 (+0200)
Subject: Only force repository metadata refresh if -ff was specified
X-Git-Tag: v23~4^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c2c446e9b297cb8aead3d5c3dee472fed61828b;p=thirdparty%2Fmkosi.git

Only force repository metadata refresh if -ff was specified

Let's make sure we use the default metadata expiration checks unless
-ff was specified. Apt doesn't support anything like this so we don't
change anything there.
---

diff --git a/mkosi/installer/dnf.py b/mkosi/installer/dnf.py
index 74a2123f9..d1a203933 100644
--- a/mkosi/installer/dnf.py
+++ b/mkosi/installer/dnf.py
@@ -199,7 +199,7 @@ class Dnf(PackageManager):
             context,
             "makecache",
             arguments=[
-                "--refresh",
+                *(["--refresh"] if context.args.force > 1 else []),
                 *(["--setopt=cacheonly=none"] if cls.executable(context.config) == "dnf5" else []),
                 *options,
             ],
diff --git a/mkosi/installer/pacman.py b/mkosi/installer/pacman.py
index a945bf822..3cb10e35e 100644
--- a/mkosi/installer/pacman.py
+++ b/mkosi/installer/pacman.py
@@ -165,7 +165,7 @@ class Pacman(PackageManager):
 
     @classmethod
     def sync(cls, context: Context) -> None:
-        cls.invoke(context, "--sync", ["--refresh"])
+        cls.invoke(context, "--sync", ["--refresh"] + (["--refresh"] if context.args.force > 1 else []))
 
     @classmethod
     def createrepo(cls, context: Context) -> None:
diff --git a/mkosi/installer/zypper.py b/mkosi/installer/zypper.py
index f37c721ac..cbe9be610 100644
--- a/mkosi/installer/zypper.py
+++ b/mkosi/installer/zypper.py
@@ -143,7 +143,7 @@ class Zypper(PackageManager):
 
     @classmethod
     def sync(cls, context: Context) -> None:
-        cls.invoke(context, "refresh")
+        cls.invoke(context, "refresh", ["--force"] if context.args.force > 1 else [])
 
     @classmethod
     def createrepo(cls, context: Context) -> None: