qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org,
	qemu-riscv@nongnu.org, qemu-block@nongnu.org,
	"Akihiko Odaki" <akihiko.odaki@daynix.com>,
	"Michael Tokarev" <mjt@tls.msk.ru>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>, "John Snow" <jsnow@redhat.com>,
	"Cleber Rosa" <crosa@redhat.com>
Subject: [PULL 39/41] meson: Fix MESONINTROSPECT parsing
Date: Thu, 31 Aug 2023 14:56:41 +0200	[thread overview]
Message-ID: <20230831125646.67855-40-philmd@linaro.org> (raw)
In-Reply-To: <20230831125646.67855-1-philmd@linaro.org>

From: Akihiko Odaki <akihiko.odaki@daynix.com>

The arguments in MESONINTROSPECT are quoted with shlex.quote() so it
must be parsed with shlex.split().

Fixes: cf60ccc330 ("cutils: Introduce bundle mechanism")
Reported-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Tested-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230812061540.5398-1-akihiko.odaki@daynix.com>
---
 scripts/symlink-install-tree.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/symlink-install-tree.py b/scripts/symlink-install-tree.py
index 8ed97e3c94..b72563895c 100644
--- a/scripts/symlink-install-tree.py
+++ b/scripts/symlink-install-tree.py
@@ -4,6 +4,7 @@
 import errno
 import json
 import os
+import shlex
 import subprocess
 import sys
 
@@ -14,7 +15,7 @@ def destdir_join(d1: str, d2: str) -> str:
     return str(PurePath(d1, *PurePath(d2).parts[1:]))
 
 introspect = os.environ.get('MESONINTROSPECT')
-out = subprocess.run([*introspect.split(' '), '--installed'],
+out = subprocess.run([*shlex.split(introspect), '--installed'],
                      stdout=subprocess.PIPE, check=True).stdout
 for source, dest in json.loads(out).items():
     bundle_dest = destdir_join('qemu-bundle', dest)
-- 
2.41.0



  parent reply	other threads:[~2023-08-31 13:09 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-31 12:56 [PULL 00/41] Misc patches for 2023-08-31 Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 01/41] accel: Remove HAX accelerator Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 02/41] accel/tcg: spelling fixes Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 03/41] qemu/uri: Use QueryParams type definition Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 04/41] bulk: Do not declare function prototypes using 'extern' keyword Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 05/41] hw/net/i82596: Include missing 'exec/address-spaces.h' header Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 06/41] hw/dma/etraxfs: Include missing 'exec/memory.h' header Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 07/41] exec/address-spaces.h: Remove unuseful 'exec/memory.h' include Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 08/41] target/ppc/pmu: Include missing 'qemu/timer.h' header Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 09/41] target/riscv/pmu: Restrict 'qemu/log.h' include to source Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 10/41] target/translate: Include missing 'exec/cpu_ldst.h' header Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 11/41] target/translate: Remove unnecessary " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 12/41] target/translate: Restrict 'exec/cpu_ldst.h' to user emulation Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 13/41] target/helpers: Remove unnecessary 'exec/cpu_ldst.h' header Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 14/41] target/helpers: Remove unnecessary 'qemu/main-loop.h' header Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 15/41] target/mips: Remove unused headers in lcsr_helper.c Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 16/41] target/xtensa: Include missing 'qemu/atomic.h' header Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 17/41] qemu/processor: Remove unused " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 18/41] exec/translation-block: Clean up includes Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 19/41] chardev/char-fe: Document FEWatchFunc typedef Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 20/41] hw/char: Have FEWatchFunc handlers return G_SOURCE_CONTINUE/REMOVE Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 21/41] hw/char/pl011: Restrict MemoryRegionOps implementation access sizes Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 22/41] hw/char/pl011: Display register name in trace events Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 23/41] hw/char/pl011: Remove duplicated PL011_INT_[RT]X definitions Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 24/41] hw/char/pl011: Replace magic values by register field definitions Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 25/41] hw/i2c/pmbus_device: Fix modifying QOM class internals from instance Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 26/41] hw/i2c: spelling fixes Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 27/41] hw/ide: " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 28/41] hw/display: " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 29/41] hw/mips: " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 30/41] hw/sd: " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 31/41] hw/usb: " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 32/41] hw/usb/hcd-xhci: Avoid variable-length array in xhci_get_port_bandwidth() Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 33/41] hw/i386: Remove unuseful kvmclock_create() stub Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 34/41] hw/i386: Rename 'hw/kvm/clock.h' -> 'hw/i386/kvm/clock.h' Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 35/41] util/fifo8: Fix typo in fifo8_push_all() description Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 36/41] util: spelling fixes Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 37/41] ui: " Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 38/41] docs/style: permit inline loop variables Philippe Mathieu-Daudé
2023-08-31 12:56 ` Philippe Mathieu-Daudé [this message]
2023-08-31 13:06   ` [PULL 39/41] meson: Fix MESONINTROSPECT parsing Michael Tokarev
2023-08-31 13:47     ` Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 40/41] build: Only define OS_OBJECT_USE_OBJC with gcc Philippe Mathieu-Daudé
2023-08-31 12:56 ` [PULL 41/41] tests/tcg/aarch64: Rename bti-crt.inc.c -> bti-crt.c.inc Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230831125646.67855-40-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=akihiko.odaki@daynix.com \
    --cc=berrange@redhat.com \
    --cc=crosa@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=mjt@tls.msk.ru \
    --cc=pbonzini@redhat.com \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=qemu-riscv@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).