From 6168a5655037394f44c9b68e0ed01bfa00cd8292 Mon Sep 17 00:00:00 2001 From: Jacob Emmert-Aronson Date: Tue, 26 Jul 2022 21:43:32 -0700 Subject: [PATCH] Emit configfile arguments in key=val format This ensures that argparse treats all values read from configfiles as explicit arguments associated with their respective keys, rather than attempting to parse them as options in their options in their own right. --- mkosi/__init__.py | 2 +- tests/test_config_parser.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mkosi/__init__.py b/mkosi/__init__.py index 0755e1060..432a9e7f1 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py @@ -5005,7 +5005,7 @@ class ArgumentParserMkosi(argparse.ArgumentParser): if cli_arg in action.option_strings: if isinstance(action, ListAction): value = value.replace(os.linesep, action.delimiter) - new_arg_strings.extend([cli_arg, value]) + new_arg_strings.append(f"{cli_arg}={value}") except OSError as e: self.error(str(e)) # return the modified argument list diff --git a/tests/test_config_parser.py b/tests/test_config_parser.py index d68e0ed62..5b99ba6f8 100644 --- a/tests/test_config_parser.py +++ b/tests/test_config_parser.py @@ -600,7 +600,7 @@ class MkosiConfigManyParams(MkosiConfigOne): "Host": { "ExtraSearchPaths": "search/here:search/there", "QemuHeadless": True, - "QemuArgs": "-vga none -device virtio-vga-gl", + "QemuArgs": "-device virtio-vga-gl -vga none", "Netdev": True, }, } @@ -734,7 +734,7 @@ class MkosiConfigManyParams(MkosiConfigOne): "Host": { "ExtraSearchPaths": "search/debi", "QemuHeadless": True, - "QemuArgs": "-nic user,model=virtio-net-pci", + "QemuArgs": "-device virtio-vga-gl,xres=1920,yres=1080 -display sdl,gl=on", "Netdev": True, }, } -- 2.47.2