From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 2 Jan 2023 13:53:47 +0000 (+0100)
Subject: ukify: Require specifying --tools for each tools directory
X-Git-Tag: v253-rc1~205^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F25912%2Fhead;p=thirdparty%2Fsystemd.git

ukify: Require specifying --tools for each tools directory

Instead of consuming N arguments as tools directories, let's always
only consume one argument per specification of --tools. This avoids
issues where the linux image and initrd are interpreted as tools
directories.
---

diff --git a/src/ukify/ukify.py b/src/ukify/ukify.py
index e1ee7106c17..2493de2a40f 100755
--- a/src/ukify/ukify.py
+++ b/src/ukify/ukify.py
@@ -687,7 +687,7 @@ usage: ukify [options…] linux initrd…
 
     p.add_argument('--tools',
                    type=pathlib.Path,
-                   nargs='+',
+                   action='append',
                    help='Directories to search for tools (systemd-measure, llvm-objcopy, ...)')
 
     p.add_argument('--output', '-o',