From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 13 Apr 2023 15:53:18 +0000 (+0200)
Subject: ukify: use UPPERCASE for parameter names
X-Git-Tag: v254-rc1~548^2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50f4add445a19e7bb40b88e473ede3489b4f2a6a;p=thirdparty%2Fsystemd.git

ukify: use UPPERCASE for parameter names

We generally nowadays use UPPERCASE for parameters in variuos help text.
Let's be consistent here too, and also drop duplicated 'usage:':
$ ukify -h
usage: ukify [options…] LINUX INITRD…
       ukify -h | --help

Build and sign Unified Kernel Images

positional arguments:
  LINUX                 vmlinuz file [.linux section]
  INITRD…               initrd files [.initrd section]
...
---

diff --git a/src/ukify/ukify.py b/src/ukify/ukify.py
index 3fbeb2b2157..fc9c4767b13 100755
--- a/src/ukify/ukify.py
+++ b/src/ukify/ukify.py
@@ -4,7 +4,7 @@
 # pylint: disable=missing-docstring,invalid-name,import-outside-toplevel
 # pylint: disable=consider-using-with,unspecified-encoding,line-too-long
 # pylint: disable=too-many-locals,too-many-statements,too-many-return-statements
-# pylint: disable=too-many-branches
+# pylint: disable=too-many-branches,fixme
 
 import argparse
 import collections
@@ -658,7 +658,7 @@ def parse_args(args=None):
         description='Build and sign Unified Kernel Images',
         allow_abbrev=False,
         usage='''\
-usage: ukify [options…] [linux [initrd…]]
+ukify [options…] [LINUX INITRD…]
        ukify -h | --help
 ''')
 
@@ -666,10 +666,12 @@ usage: ukify [options…] [linux [initrd…]]
     p.error = lambda message: p.exit(2, f'{p.prog}: error: {message}\n')
 
     p.add_argument('linux',
+                   metavar='LINUX',
                    type=pathlib.Path,
                    nargs="?",
                    help='vmlinuz file [.linux section]')
     p.add_argument('initrd',
+                   metavar='INITRD…',
                    type=pathlib.Path,
                    nargs='*',
                    help='initrd files [.initrd section]')