From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 31 May 2023 19:58:58 +0000 (+0200)
Subject: fedora: Simplify url handling
X-Git-Tag: v15~135^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac8f89e5be368180730f174d6f333dcc3b99d085;p=thirdparty%2Fmkosi.git

fedora: Simplify url handling
---

diff --git a/mkosi/distributions/fedora.py b/mkosi/distributions/fedora.py
index cd7b9840d..b1076892d 100644
--- a/mkosi/distributions/fedora.py
+++ b/mkosi/distributions/fedora.py
@@ -36,20 +36,17 @@ class FedoraInstaller(DistributionInstaller):
             release_url = f"baseurl={state.config.local_mirror}"
             updates_url = None
         elif state.config.mirror:
-            baseurl = urllib.parse.urljoin(state.config.mirror, f"releases/{release}/Everything/$basearch/os/")
-            media = urllib.parse.urljoin(baseurl.replace("$basearch", state.installer.architecture(state.config.architecture)), "media.repo")
-            if not url_exists(media):
-                baseurl = urllib.parse.urljoin(state.config.mirror, f"development/{release}/Everything/$basearch/os/")
-
-            release_url = f"baseurl={baseurl}"
-            updates_url = f"baseurl={state.config.mirror}/updates/{release}/Everything/$basearch/"
+            directory = "development" if release == "rawhide" else "releases"
+            release_url = f"baseurl={state.config.mirror}/{directory}/$releasever/Everything/$basearch/os/"
+            updates_url = f"baseurl={state.config.mirror}/updates/$releasever/Everything/$basearch/"
         else:
             release_url = f"metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-{release}&arch=$basearch"
             updates_url = (
                 "metalink=https://mirrors.fedoraproject.org/metalink?"
                 f"repo=updates-released-f{release}&arch=$basearch"
             )
-        if release == 'rawhide':
+
+        if release == "rawhide":
             # On rawhide, the "updates" repo is the same as the "fedora" repo.
             # In other versions, the "fedora" repo is frozen at release, and "updates" provides any new packages.
             updates_url = None