]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Simplify arch repositories() function a bit
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Tue, 30 Jan 2024 18:06:28 +0000 (19:06 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 31 Jan 2024 13:24:43 +0000 (14:24 +0100)
mkosi/distributions/arch.py

index b9ed80c4f37c502a46fd0d5330f165c6697a2c39..c297f1d83dae0f3a71acfb86867e2855e64b1037 100644 (file)
@@ -76,19 +76,19 @@ class Installer(DistributionInstaller):
                 url = f"{context.config.mirror or 'https://geo.mirror.pkgbuild.com'}/$repo/os/$arch"
 
             # Testing repositories have to go before regular ones to to take precedence.
-            for id in (
-                "core-testing",
-                "core-testing-debug",
-                "extra-testing",
-                "extra-testing-debug",
-                "core-debug",
-                "extra-debug",
-            ):
-                if id in context.config.repositories:
-                    yield PacmanRepository(id, url)
-
-            for id in ("core", "extra"):
-                yield PacmanRepository(id, url)
+            repos = [
+                repo for repo in (
+                    "core-testing",
+                    "core-testing-debug",
+                    "extra-testing",
+                    "extra-testing-debug",
+                    "core-debug",
+                    "extra-debug",
+                ) if repo in context.config.repositories
+            ] + ["core", "extra"]
+
+            for repo in repos:
+                yield PacmanRepository(repo, url)
 
     @classmethod
     def architecture(cls, arch: Architecture) -> str: