]> www.infradead.org Git - users/dwmw2/qemu.git/commit
scripts/symlink-install-tree.py: Fix MESONINTROSPECT parsing
authorAkihiko Odaki <akihiko.odaki@daynix.com>
Tue, 29 Oct 2024 12:54:43 +0000 (12:54 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 29 Oct 2024 15:04:46 +0000 (15:04 +0000)
commita3c3345cac7d2f9cc827d7ecce915795244ac230
treef1ba9bcd5b853a0fed93e98b4b92275a50ba98fc
parentbc4d45b275fe63184a633d7d4f2ea2959b1fa4e7
scripts/symlink-install-tree.py: Fix MESONINTROSPECT parsing

The arguments in MESONINTROSPECT are quoted with shlex.quote() so it
must be parsed with shlex.split().  Otherwise the script will fail if
the build directory has a character like "~" in it.

Note: this fix cannot be backported directly to any stable branch
that doesn't require Meson version 1.4.0 or better; otherwise it will
work OK on Linux but will break on Windows hosts.

(Unfortunately, Meson prior to version 1.4.0 was inconsistent between
host OSes about how it quoted arguments, and used a different quoting
process on Windows hosts.  Our current git trunk already requires
1.5.0 as of commit 07f0d32641e ("Require meson version 1.5.0"), but
the stable branches are still on older Meson.)

Fixes: cf60ccc330 ("cutils: Introduce bundle mechanism")
Reported-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Tested-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-id: 20241018130852.931509-1-peter.maydell@linaro.org
[PMM: Updated commit message to give all the detail about the
Meson version compability requirements.]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
scripts/symlink-install-tree.py