diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2017-09-01 11:36:33 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-09-04 23:26:53 +0300 |
| commit | 2cabcb39c9f8ebc8c525a5168df7f036c7cb5ef7 (patch) | |
| tree | dddaab332b90d08a120e332053662008722720f5 | |
| parent | 72a6683c6f564afa8f8d7e96b0238961aa867f00 (diff) | |
| download | meson-2cabcb39c9f8ebc8c525a5168df7f036c7cb5ef7.zip meson-2cabcb39c9f8ebc8c525a5168df7f036c7cb5ef7.tar.gz meson-2cabcb39c9f8ebc8c525a5168df7f036c7cb5ef7.tar.bz2 | |
gnome: Flatten the sources for generate_gir()
If we don't do that, the traversal of the sources list to generate the
sources file for g-ir-scanner is going to explode with a Python
backtrace like this one:
File "/usr/lib/python3.5/site-packages/mesonbuild/modules/gnome.py", line 463, in generate_gir
gir_filelist.write(os.path.join(srcdir, s) + '\n')
File "/usr/lib/python3.5/posixpath.py", line 89, in join
genericpath._check_arg_types('join', a, *p)
File "/usr/lib/python3.5/genericpath.py", line 143, in _check_arg_types
(funcname, s.__class__.__name__)) from None
if the sources list contains a list.
| -rw-r--r-- | mesonbuild/modules/gnome.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 19a1198..cb8f560 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -423,7 +423,7 @@ class GnomeModule(ExtensionModule): raise MesonException('gobject-introspection dependency was not found, gir cannot be generated.') ns = kwargs.pop('namespace') nsversion = kwargs.pop('nsversion') - libsources = kwargs.pop('sources') + libsources = mesonlib.flatten(kwargs.pop('sources')) girfile = '%s-%s.gir' % (ns, nsversion) srcdir = os.path.join(state.environment.get_source_dir(), state.subdir) builddir = os.path.join(state.environment.get_build_dir(), state.subdir) |