From: Franck Bui <fbui@suse.com>
Date: Thu, 16 Feb 2023 10:50:32 +0000 (+0100)
Subject: opensuse: 'leap' as release name is now an alias for 'stable'
X-Git-Tag: v15~322^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1351%2Fhead;p=thirdparty%2Fmkosi.git

opensuse: 'leap' as release name is now an alias for 'stable'

Previously using 'leap' would have installed Leap 15.1 which doesn't make sense
since this version of Leap is obsolete and no more supported. Install the latest
stable version instead.
---

diff --git a/mkosi/distributions/opensuse.py b/mkosi/distributions/opensuse.py
index f263030dd..45cc2c425 100644
--- a/mkosi/distributions/opensuse.py
+++ b/mkosi/distributions/opensuse.py
@@ -112,15 +112,14 @@ def zypper_remove(state: MkosiState, packages: Iterable[str]) -> None:
 @complete_step("Installing openSUSE…")
 def install_opensuse(state: MkosiState) -> None:
     release = state.config.release.strip('"')
+    if release == "leap":
+        release = "stable"
 
     # If the release looks like a timestamp, it's Tumbleweed. 13.x is legacy (14.x won't ever appear). For
     # anything else, let's default to Leap.
     if release.isdigit() or release == "tumbleweed":
         release_url = f"{state.config.mirror}/tumbleweed/repo/oss/"
         updates_url = f"{state.config.mirror}/update/tumbleweed/"
-    elif release == "leap":
-        release_url = f"{state.config.mirror}/distribution/leap/15.1/repo/oss/"
-        updates_url = f"{state.config.mirror}/update/leap/15.1/oss/"
     elif release in ("current", "stable"):
         release_url = f"{state.config.mirror}/distribution/openSUSE-stable/repo/oss/"
         updates_url = f"{state.config.mirror}/update/openSUSE-{release}/"