From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 1 Sep 2023 09:51:21 +0000 (+0200)
Subject: Make argv default to an empty tuple in parse_config()
X-Git-Tag: v16~23^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=150a3ed452723d3955d7fc993a14ed1c1271b45d;p=thirdparty%2Fmkosi.git

Make argv default to an empty tuple in parse_config()

Makes it easier to use parse_config() from tests.
---

diff --git a/mkosi/__main__.py b/mkosi/__main__.py
index 9b3e1f446..8788e6b69 100644
--- a/mkosi/__main__.py
+++ b/mkosi/__main__.py
@@ -42,7 +42,7 @@ def propagate_failed_return() -> Iterator[None]:
 @propagate_failed_return()
 def main() -> None:
     log_setup()
-    args, presets = parse_config()
+    args, presets = parse_config(sys.argv[1:])
 
     try:
         run_verb(args, presets)
diff --git a/mkosi/config.py b/mkosi/config.py
index 9b45dc0d9..4694b3be5 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -16,7 +16,6 @@ import platform
 import shlex
 import shutil
 import subprocess
-import sys
 import textwrap
 import uuid
 from collections.abc import Iterable, Sequence
@@ -1842,7 +1841,7 @@ def resolve_deps(args: MkosiArgs, presets: Sequence[MkosiConfig]) -> list[MkosiC
     return sorted(presets, key=lambda p: order.index(p.preset))
 
 
-def parse_config(argv: Optional[Sequence[str]] = None) -> tuple[MkosiArgs, tuple[MkosiConfig, ...]]:
+def parse_config(argv: Sequence[str] = ()) -> tuple[MkosiArgs, tuple[MkosiConfig, ...]]:
     settings_lookup_by_name = {s.name: s for s in SETTINGS}
     settings_lookup_by_dest = {s.dest: s for s in SETTINGS}
     match_lookup = {m.name: m for m in MATCHES}
@@ -1964,8 +1963,6 @@ def parse_config(argv: Optional[Sequence[str]] = None) -> tuple[MkosiArgs, tuple
     namespace = argparse.Namespace()
     defaults = argparse.Namespace()
 
-    if argv is None:
-        argv = sys.argv[1:]
     argv = list(argv)
 
     # Make sure the verb command gets explicitly passed. Insert a -- before the positional verb argument