]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
openmandriva: Fix mirror
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 19 Oct 2023 09:39:56 +0000 (11:39 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 19 Oct 2023 10:05:29 +0000 (12:05 +0200)
The mirrorlist is down it seems, let's use baseurl= as is done in
the mandriva repo files.

mkosi/distributions/openmandriva.py

index e5403544e18ef1ffd3a4a5a7d5733b4a0c2b52f8..bce607124bc7c8e14b1f0f66ecad57b71d0aa55d 100644 (file)
@@ -34,6 +34,7 @@ class Installer(DistributionInstaller):
     def setup(cls, state: MkosiState) -> None:
         release = state.config.release.strip("'")
         arch = state.config.distribution.architecture(state.config.architecture)
+        mirror = state.config.mirror or "http://mirror.openmandriva.org"
 
         if release[0].isdigit():
             release_model = "rock"
@@ -45,14 +46,10 @@ class Installer(DistributionInstaller):
         if state.config.local_mirror:
             release_url = f"baseurl={state.config.local_mirror}"
             updates_url = None
-        elif state.config.mirror:
-            baseurl = f"{state.config.mirror}/{release_model}/repository/{arch}/main"
+        else:
+            baseurl = f"{mirror}/{release_model}/repository/{arch}/main"
             release_url = f"baseurl={baseurl}/release/"
             updates_url = f"baseurl={baseurl}/updates/"
-        else:
-            baseurl = f"http://mirrors.openmandriva.org/mirrors.php?platform={release_model}&arch={arch}&repo=main"
-            release_url = f"mirrorlist={baseurl}&release=release"
-            updates_url = f"mirrorlist={baseurl}&release=updates"
 
         gpgurl = "https://raw.githubusercontent.com/OpenMandrivaAssociation/openmandriva-repos/master/RPM-GPG-KEY-OpenMandriva"