From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 21 Jan 2025 09:15:00 +0000 (+0100)
Subject: Simplify KernelInstallContext.parse() a little
X-Git-Tag: v25~17^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c0780e108248b19c3802bcdc98ac0c238d17052;p=thirdparty%2Fmkosi.git

Simplify KernelInstallContext.parse() a little
---

diff --git a/kernel-install/50-mkosi.install b/kernel-install/50-mkosi.install
index 68b371b62..ec33253a2 100755
--- a/kernel-install/50-mkosi.install
+++ b/kernel-install/50-mkosi.install
@@ -52,8 +52,8 @@ def main() -> None:
     log_setup()
 
     context = KernelInstallContext.parse(
-        "kernel-install plugin to build initrds or Unified Kernel Images using mkosi",
-        "50-mkosi.install COMMAND KERNEL_VERSION ENTRY_DIR KERNEL_IMAGE INITRD…",
+        name="50-mkosi.install",
+        description="kernel-install plugin to build initrds or Unified Kernel Images using mkosi",
     )
 
     if context.command != "add" or not we_are_wanted(context):
diff --git a/kernel-install/51-mkosi-addon.install b/kernel-install/51-mkosi-addon.install
index d16e4abf3..7e8302ed5 100755
--- a/kernel-install/51-mkosi-addon.install
+++ b/kernel-install/51-mkosi-addon.install
@@ -16,8 +16,8 @@ def main() -> None:
     log_setup()
 
     context = KernelInstallContext.parse(
-        "kernel-install plugin to build local addon for initrd/cmdline",
-        "51-mkosi-addon.install COMMAND KERNEL_VERSION ENTRY_DIR KERNEL_IMAGE…",
+        name="51-mkosi-addon.install",
+        description="kernel-install plugin to build local addon for initrd/cmdline",
     )
 
     # No local configuration? Then nothing to do
diff --git a/mkosi/initrd.py b/mkosi/initrd.py
index 34294a5e0..751df9fd5 100644
--- a/mkosi/initrd.py
+++ b/mkosi/initrd.py
@@ -37,11 +37,11 @@ class KernelInstallContext:
     verbose: bool
 
     @staticmethod
-    def parse(description: str, usage: str) -> "KernelInstallContext":
+    def parse(*, name: str, description: str) -> "KernelInstallContext":
         parser = argparse.ArgumentParser(
             description=description,
             allow_abbrev=False,
-            usage=usage,
+            usage=f"{name} COMMAND KERNEL_VERSION ENTRY_DIR KERNEL_IMAGE…",
         )
 
         parser.add_argument(