From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 28 Jul 2023 13:52:43 +0000 (+0200)
Subject: arch: Put testing repositories first if enabled so they take priority
X-Git-Tag: v15~61^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1708%2Fhead;p=thirdparty%2Fmkosi.git

arch: Put testing repositories first if enabled so they take priority
---

diff --git a/mkosi/distributions/arch.py b/mkosi/distributions/arch.py
index cd3c76ea2..7625659b1 100644
--- a/mkosi/distributions/arch.py
+++ b/mkosi/distributions/arch.py
@@ -68,14 +68,18 @@ def setup_pacman(state: MkosiState) -> None:
 
     config.parent.mkdir(mode=0o755, exist_ok=True, parents=True)
 
-    repos = ["core"]
-    if not state.config.local_mirror:
-        repos += ["extra"]
+    repos = []
 
+    # Testing repositories have to go before regular ones to to take precedence.
+    if not state.config.local_mirror:
         for repo in ("core-testing", "extra-testing"):
             if repo in state.config.repositories:
                 repos += [repo]
 
+    repos += ["core"]
+    if not state.config.local_mirror:
+        repos += ["extra"]
+
     with config.open("w") as f:
         f.write(
             dedent(