From: Jani Välimaa <wally@mageia.org>
Date: Sun, 4 Dec 2022 16:35:16 +0000 (+0200)
Subject: mageia: use release where applicable instead of state.config.release for consistency
X-Git-Tag: v15~383^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1282%2Fhead;p=thirdparty%2Fmkosi.git

mageia: use release where applicable instead of state.config.release for consistency
---

diff --git a/mkosi/distributions/mageia.py b/mkosi/distributions/mageia.py
index db1069dfd..0e61c242a 100644
--- a/mkosi/distributions/mageia.py
+++ b/mkosi/distributions/mageia.py
@@ -30,14 +30,14 @@ def install_mageia(state: MkosiState) -> None:
         release_url = f"baseurl={state.config.local_mirror}"
         updates_url = None
     elif state.config.mirror:
-        baseurl = f"{state.config.mirror}/distrib/{state.config.release}/{state.config.architecture}/media/core/"
+        baseurl = f"{state.config.mirror}/distrib/{release}/{state.config.architecture}/media/core/"
         release_url = f"baseurl={baseurl}/release/"
         if release == "cauldron":
             updates_url = None
         else:
             updates_url = f"baseurl={baseurl}/updates/"
     else:
-        baseurl = f"https://www.mageia.org/mirrorlist/?release={state.config.release}&arch={state.config.architecture}&section=core"
+        baseurl = f"https://www.mageia.org/mirrorlist/?release={release}&arch={state.config.architecture}&section=core"
         release_url = f"mirrorlist={baseurl}&repo=release"
         if release == "cauldron":
             updates_url = None
@@ -46,9 +46,9 @@ def install_mageia(state: MkosiState) -> None:
 
     gpgpath = Path("/etc/pki/rpm-gpg/RPM-GPG-KEY-Mageia")
 
-    repos = [Repo(f"mageia-{state.config.release}", release_url, gpgpath)]
+    repos = [Repo(f"mageia-{release}", release_url, gpgpath)]
     if updates_url is not None:
-        repos += [Repo(f"mageia-{state.config.release}-updates", updates_url, gpgpath)]
+        repos += [Repo(f"mageia-{release}-updates", updates_url, gpgpath)]
 
     setup_dnf(state, repos)