From 13db445e11590f555184cf030f3cc43137c35327 Mon Sep 17 00:00:00 2001 From: Scott D Phillips Date: Mon, 1 May 2017 13:17:12 -0700 Subject: [PATCH] uninstalled: fixes for windows usage Fix a couple small breakages with windows usage, (1) Add sys.executable to a subprocess invocation and (2) escape a path fragment that gets used in a regex. https://bugzilla.gnome.org/show_bug.cgi?id=782026 --- gst-uninstalled.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gst-uninstalled.py b/gst-uninstalled.py index d5f82b7313..b35783831f 100755 --- a/gst-uninstalled.py +++ b/gst-uninstalled.py @@ -45,7 +45,7 @@ def get_subprocess_env(options): sharedlib_reg = re.compile(r'\.so|\.dylib|\.dll') typelib_reg = re.compile(r'.*\.typelib$') - pluginpath_reg = re.compile(r'lib.*' + os.path.normpath('/gstreamer-1.0/')) + pluginpath_reg = re.compile(r'lib.*' + re.escape(os.path.normpath('/gstreamer-1.0/'))) if os.name is 'nt': lib_path_envvar = 'PATH' @@ -85,7 +85,7 @@ def get_subprocess_env(options): presets = set() encoding_targets = set() pkg_dirs = set() - if '--installed' in subprocess.check_output([mesonintrospect, '-h']).decode(): + if '--installed' in subprocess.check_output([sys.executable, mesonintrospect, '-h']).decode(): installed_s = subprocess.check_output([sys.executable, mesonintrospect, options.builddir, '--installed']) for path, installpath in json.loads(installed_s.decode()).items():