From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 17 Jan 2024 13:03:15 +0000 (+0100)
Subject: Fix --mirror for Fedora (again)
X-Git-Tag: v20.2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a1538fd758c595b93703338877e6bb9b8a93f48;p=thirdparty%2Fmkosi.git

Fix --mirror for Fedora (again)
---

diff --git a/mkosi/distributions/fedora.py b/mkosi/distributions/fedora.py
index 16ccb49e7..78cdc2b41 100644
--- a/mkosi/distributions/fedora.py
+++ b/mkosi/distributions/fedora.py
@@ -67,9 +67,9 @@ class Installer(DistributionInstaller):
                     RpmRepository(repo.lower(), f"{url}/$basearch/debug/tree", gpgurls, enabled=False),
                     RpmRepository(repo.lower(), f"{url}/source/tree", gpgurls, enabled=False),
                 ]
-        elif context.config.mirror:
+        elif (m := context.config.mirror):
             directory = "development" if context.config.release == "rawhide" else "releases"
-            url = f"baseurl={join_mirror(context.config.mirror, f'fedora/{directory}/$releasever/Everything')}"
+            url = f"baseurl={join_mirror(m, f'fedora/linux/{directory}/$releasever/Everything')}"
             repos += [
                 RpmRepository("fedora", f"{url}/$basearch/os", gpgurls),
                 RpmRepository("fedora-debuginfo", f"{url}/$basearch/debug/tree", gpgurls, enabled=False),
@@ -77,14 +77,14 @@ class Installer(DistributionInstaller):
             ]
 
             if context.config.release != "rawhide":
-                url = f"baseurl={join_mirror(context.config.mirror, 'updates/$releasever/Everything')}"
+                url = f"baseurl={join_mirror(m, 'fedora/linux/updates/$releasever/Everything')}"
                 repos += [
                     RpmRepository("updates", f"{url}/$basearch", gpgurls),
                     RpmRepository("updates-debuginfo", f"{url}/$basearch/debug", gpgurls, enabled=False),
                     RpmRepository("updates-source", f"{url}/source/tree", gpgurls, enabled=False),
                 ]
 
-                url = f"baseurl={join_mirror(context.config.mirror, 'updates/testing/$releasever/Everything')}"
+                url = f"baseurl={join_mirror(m, 'fedora/linux/updates/testing/$releasever/Everything')}"
                 repos += [
                     RpmRepository("updates-testing", f"{url}/$basearch", gpgurls, enabled=False),
                     RpmRepository("updates-testing-debuginfo", f"{url}/$basearch/debug", gpgurls, enabled=False),