From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 8 Sep 2023 11:04:12 +0000 (+0200)
Subject: Fix --help
X-Git-Tag: v17~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88740a61981458fbbd030878eaa9d5cf06d3c1a2;p=thirdparty%2Fmkosi.git

Fix --help

We need to only execute --help once we have the full parser otherwise
it won't show all settings.
---

diff --git a/mkosi/config.py b/mkosi/config.py
index 8f21d4970..3cc3836f0 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -1688,11 +1688,6 @@ def create_argument_parser(*, settings: bool) -> argparse.ArgumentParser:
         formatter_class=CustomHelpFormatter,
     )
 
-    parser.add_argument(
-        "-h", "--help",
-        action=PagerHelpAction,
-        help=argparse.SUPPRESS,
-    )
     parser.add_argument(
         "--version",
         action="version",
@@ -1795,6 +1790,11 @@ def create_argument_parser(*, settings: bool) -> argparse.ArgumentParser:
         nargs=argparse.REMAINDER,
         help=argparse.SUPPRESS,
     )
+    parser.add_argument(
+        "-h", "--help",
+        action=PagerHelpAction,
+        help=argparse.SUPPRESS,
+    )
 
     last_section = None