Commit e10c27fb authored by Antonio Ospite's avatar Antonio Ospite Committed by Antonio Ospite
Browse files

gst-env: use in get_pkgconfig_variable_from_pcfile()

The pcfile argument passed to get_target_install_filename() is
guaranteed to be a Path() object so use the .open() method to open the
file instead of the standard open() function.

This makes it possible to run on older systems with pyhton3.5
where the standard open() function cannot handle Path arguments.

The change fixes errors like the following:

$ ninja -C build/ devenv
ninja: Entering directory `build/'
[0/1] Running external command devenv
Traceback (most recent call last):
  File "/home/ao2/gst-build/", line 493, in <module>
    env = get_subprocess_env(options, gst_version)
  File "/home/ao2/gst-build/", line 342, in get_subprocess_env
    elif is_gio_module(target, filename, options.builddir):
  File "/home/ao2/gst-build/", line 121, in is_gio_module
    giomoduledir = PurePath(get_pkgconfig_variable(builddir, 'gio-2.0'...
parent 2f3ace52
Pipeline #239429 waiting for manual action with stages
in 4 minutes and 53 seconds
......@@ -86,7 +86,7 @@ def get_target_install_filename(target, filename):
def get_pkgconfig_variable_from_pcfile(pcfile, varname):
variables = {}
substre = re.compile('\$\{[^${}]+\}')
with open(pcfile, 'r', encoding='utf-8') as f:
with'r', encoding='utf-8') as f:
for line in f:
if '=' not in line:
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment