]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
fedora: remove unused output variable
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 4 May 2023 15:01:57 +0000 (17:01 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 4 May 2023 21:52:34 +0000 (23:52 +0200)
mkosi/distributions/fedora.py

index 8d928f975c7cfd2cdaafc150d0eec556d5e1d138..226d60ccf1e2dc0e2006d0ce751abe0f167e8d13 100644 (file)
@@ -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