From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 2 Apr 2023 19:10:15 +0000 (+0200)
Subject: Remove Additional Configuration Options argparse group
X-Git-Tag: v15~268^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1e8246ef6b443ac491cb6a9b723281b3134c2a8;p=thirdparty%2Fmkosi.git

Remove Additional Configuration Options argparse group

Let's move these settings to the top level group along with the other
CLI arguments that aren't really config.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 9f46d946e..f8b717a93 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1393,6 +1393,25 @@ def create_parser() -> ArgumentParserMkosi:
         version="%(prog)s " + __version__,
         help=argparse.SUPPRESS,
     )
+    parser.add_argument(
+        "-C", "--directory",
+        help="Change to specified directory before doing anything",
+        type=Path,
+        metavar="PATH",
+    )
+    parser.add_argument(
+        "--config",
+        dest="config_path",
+        help="Read configuration data from file",
+        type=Path,
+        metavar="PATH",
+    )
+    parser.add_argument(
+        "--debug",
+        action=CommaDelimitedListAction,
+        default=[],
+        help="Turn on debugging output",
+    )
 
     group = parser.add_argument_group("Distribution options")
     group.add_argument("-d", "--distribution", choices=Distribution.__members__, help="Distribution to install")
@@ -1839,26 +1858,6 @@ def create_parser() -> ArgumentParserMkosi:
         help="Set ACLs on generated directories to permit the user running mkosi to remove them",
     )
 
-    group = parser.add_argument_group("Additional configuration options")
-    group.add_argument(
-        "-C", "--directory",
-        help="Change to specified directory before doing anything",
-        type=Path,
-        metavar="PATH",
-    )
-    group.add_argument(
-        "--config",
-        dest="config_path",
-        help="Read configuration data from file",
-        type=Path,
-        metavar="PATH",
-    )
-    group.add_argument(
-        "--debug",
-        action=CommaDelimitedListAction,
-        default=[],
-        help="Turn on debugging output",
-    )
     try:
         import argcomplete