From 41043aba5d8725f5824046b1732062b270eee525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jani=20V=C3=A4limaa?= <wally@mageia.org> Date: Sun, 4 Dec 2022 12:51:32 +0200 Subject: [PATCH] Don't add update repo for cauldron --- mkosi/__init__.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/mkosi/__init__.py b/mkosi/__init__.py index cffedc5..f01d366 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py @@ -2157,17 +2157,25 @@ def install_fedora(state: MkosiState) -> None: @complete_step("Installing Mageia…") def install_mageia(state: MkosiState) -> None: + release = state.config.release.strip("'") + 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}/distrib/{state.config.release}/{state.config.architecture}/media/core/" release_url = f"baseurl={baseurl}/release/" - updates_url = f"baseurl={baseurl}/updates/" + 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}§ion=core" release_url = f"mirrorlist={baseurl}&repo=release" - updates_url = f"mirrorlist={baseurl}&repo=updates" + if release == "cauldron": + updates_url = None + else: + updates_url = f"mirrorlist={baseurl}&repo=updates" gpgpath = Path("/etc/pki/rpm-gpg/RPM-GPG-KEY-Mageia") -- 2.38.1