From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 4 May 2023 15:01:57 +0000 (+0200)
Subject: fedora: remove unused output variable
X-Git-Tag: v15~182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e803212534f9135bcc92ec6b69e222955470f240;p=thirdparty%2Fmkosi.git

fedora: remove unused output variable
---

diff --git a/mkosi/distributions/fedora.py b/mkosi/distributions/fedora.py
index 8d928f975..226d60ccf 100644
--- a/mkosi/distributions/fedora.py
+++ b/mkosi/distributions/fedora.py
@@ -28,7 +28,7 @@ class FedoraInstaller(DistributionInstaller):
 
     @classmethod
     def install_packages(cls, state: MkosiState, packages: Sequence[str], apivfs: bool = True) -> None:
-        release, releasever = parse_fedora_release(state.config.release)
+        release = parse_fedora_release(state.config.release)
 
         if state.config.local_mirror:
             release_url = f"baseurl={state.config.local_mirror}"
@@ -67,13 +67,13 @@ class FedoraInstaller(DistributionInstaller):
         invoke_dnf(state, "remove", packages)
 
 
-def parse_fedora_release(release: str) -> tuple[str, str]:
+def parse_fedora_release(release: str) -> str:
+    # The release can be specified as 'rawhide-<version>'. We don't make use
+    # of the second part right now, but we allow it for compatibility.
     if release.startswith("rawhide-"):
         release, releasever = release.split("-")
         logging.info(f"Fedora rawhide — release version: {releasever}")
-        return ("rawhide", releasever)
-    else:
-        return (release, release)
+    return release
 
 
 def url_exists(url: str) -> bool:
@@ -121,7 +121,7 @@ def invoke_dnf(
     apivfs: bool = True
 ) -> None:
     if state.config.distribution == Distribution.fedora:
-        release, _ = parse_fedora_release(state.config.release)
+        release = parse_fedora_release(state.config.release)
     else:
         release = state.config.release