Remove releasever from MkosiArgs

Its scope is limited to a single function so just make it a local
variable.

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 91ef9ca089b2c97602c67ca7971db55340e6c8c0..0b8312f074c9ed12df078fb6afa6ce2c1009211e 100644 (file)
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2223,12 +2223,12 @@ def install_fedora(args: MkosiArgs, root: Path, do_run_build_script: bool) -> No
     if args.release == "rawhide":
         last = list(FEDORA_KEYS_MAP)[-1]
         warn(f"Assuming rawhide is version {last} — " + "You may specify otherwise with --release=rawhide-<version>")
-        args.releasever = last
+        releasever = last
     elif args.release.startswith("rawhide-"):
-        args.release, args.releasever = args.release.split("-")
-        MkosiPrinter.info(f"Fedora rawhide — release version: {args.releasever}")
+        args.release, releasever = args.release.split("-")
+        MkosiPrinter.info(f"Fedora rawhide — release version: {releasever}")
     else:
-        args.releasever = args.release
+        releasever = args.release
 
     arch = args.architecture or platform.machine()
 
@@ -2247,18 +2247,18 @@ def install_fedora(args: MkosiArgs, root: Path, do_run_build_script: bool) -> No
             f"repo=updates-released-f{args.release}&arch=$basearch"
         )
 
-    if args.releasever in FEDORA_KEYS_MAP:
-        key = FEDORA_KEYS_MAP[args.releasever]
+    if releasever in FEDORA_KEYS_MAP:
+        key = FEDORA_KEYS_MAP[releasever]
 
         # The website uses short identifiers for Fedora < 35: https://pagure.io/fedora-web/websites/issue/196
-        if int(args.releasever) < 35:
-            key = FEDORA_KEYS_MAP[args.releasever][-8:]
+        if int(releasever) < 35:
+            key = FEDORA_KEYS_MAP[releasever][-8:]
 
         gpgid = f"keys/{key}.txt"
     else:
         gpgid = "fedora.gpg"
 
-    gpgpath = Path(f"/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-{args.releasever}-{arch}")
+    gpgpath = Path(f"/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-{releasever}-{arch}")
     gpgurl = urllib.parse.urljoin("https://getfedora.org/static/", gpgid)
 
     repos = [Repo("fedora", f"Fedora {args.release.capitalize()} - base", release_url, gpgpath, gpgurl)]

diff --git a/mkosi/backend.py b/mkosi/backend.py
index 1a9652842945755714a269c50fe93f0403959a79..a960c5cdd1ee1ffcd610969acdf261a914ed131c 100644 (file)
--- a/mkosi/backend.py
+++ b/mkosi/backend.py
@@ -479,7 +479,6 @@ class MkosiArgs:
 
     partition_table: Optional[PartitionTable] = None
 
-    releasever: Optional[str] = None
     ran_sfdisk: bool = False
 
     def get_partition(self, ident: PartitionIdentifier) -> Optional[Partition]: