mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 11:41:09 +00:00
Code Issues 1 Projects Releases Wiki Activity

uninstalled: fixes for windows usage

Browse source 
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
This commit is contained in:
Scott D Phillips 2017-05-01 13:17:12 -07:00 committed by Nirbheek Chauhan
parent e69935afac
commit 13db445e11
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst-uninstalled.py
View file

@ -45,7 +45,7 @@ def get_subprocess_env(options):
sharedlib_reg = re.compile(r'\.so|\.dylib|\.dll') sharedlib_reg = re.compile(r'\.so|\.dylib|\.dll')
typelib_reg = re.compile(r'.*\.typelib$') 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': if os.name is 'nt':
lib_path_envvar = 'PATH' lib_path_envvar = 'PATH'
@ -85,7 +85,7 @@ def get_subprocess_env(options):
presets = set() presets = set()
encoding_targets = set() encoding_targets = set()
pkg_dirs = 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, installed_s = subprocess.check_output([sys.executable, mesonintrospect,
options.builddir, '--installed']) options.builddir, '--installed'])
for path, installpath in json.loads(installed_s.decode()).items(): for path, installpath in json.loads(installed_s.decode()).items():