diff options
author | Antonio Ospite <antonio.ospite@collabora.com> | 2020-09-24 11:50:09 +0000 |
---|---|---|
committer | Antonio Ospite <ao2@ao2.it> | 2020-11-19 10:10:56 +0000 |
commit | e10c27fb17f6cca8eb4792d4ea48869bbe1cc44c (patch) | |
tree | 05b9f0421f6612daf34e488d03eda376809d7449 | |
parent | 2f3ace52c42de368c995941d0fe2303ea8c718d2 (diff) |
gst-env: use Path.open() 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 gst-env.py 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/gst-env.py", line 493, in <module>
env = get_subprocess_env(options, gst_version)
File "/home/ao2/gst-build/gst-env.py", line 342, in get_subprocess_env
elif is_gio_module(target, filename, options.builddir):
File "/home/ao2/gst-build/gst-env.py", line 121, in is_gio_module
giomoduledir = PurePath(get_pkgconfig_variable(builddir, 'gio-2.0', 'giomoduledir'))
File "/home/ao2/gst-build/gst-env.py", line 110, in get_pkgconfig_variable
return get_pkgconfig_variable_from_pcfile(pcfile, varname)
File "/home/ao2/gst-build/gst-env.py", line 89, in get_pkgconfig_variable_from_pcfile
with open(pcfile, 'r', encoding='utf-8') as f:
TypeError: invalid file: PosixPath('/home/ao2/gst-build/build/meson-private/gio-2.0.pc')
FAILED: meson-devenv
-----------------------------------------------------------------------
(cherry picked from commit fa9627eb75c3904c53b81e06f6e0d2034a4a2d98)
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-build/-/merge_requests/220>
-rwxr-xr-x | gst-env.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 pcfile.open('r', encoding='utf-8') as f: for line in f: if '=' not in line: continue |