From 62f173913341f5e42917ac9277a001c0b2f33528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 12 Jun 2018 15:03:03 +0100 Subject: [PATCH] uninstalled: Fix meson detection when using meson from a git checkout This would not trigger on the build bot because there is special casing in the code for a meson checkout underneath gst-build. Fix needed as mesonintrospect.py was changed into 'meson.py introspect' in recent meson versions. When using meson from git to configure the build the uninstalled script would pick up a system meson instead which then would then error out parsing the coredata from the newer meson. --- common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.py b/common.py index f88b65ffa0..b3ee7c5547 100644 --- a/common.py +++ b/common.py @@ -67,7 +67,7 @@ def get_meson(): continue if os.path.exists (comp): mesondir = os.path.dirname(comp) - if mesonintrospect.endswith('.py'): + if mesonintrospect.endswith('.py') or mesonintrospect.endswith('.py introspect'): meson = os.path.join(mesondir, 'meson.py') else: meson = os.path.join(mesondir, 'meson')