| Message ID | 20230831125646.67855-40-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | None | expand |
31.08.2023 15:56, Philippe Mathieu-Daudé wrote: > 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 This turned out to be wrong on windows. /mjt
On 31/8/23 15:06, Michael Tokarev wrote: > 31.08.2023 15:56, Philippe Mathieu-Daudé wrote: >> 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 > > This turned out to be wrong on windows. Doh, thanks for reporting, I haven't noticed on the list. I'll repost without this patch. Regards, Phil.
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)