diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-10-02 00:04:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-02 00:04:18 +0300 |
| commit | 357b34f9154ee3aae50d06d32ea6c4e0e152558c (patch) | |
| tree | 038a74b6a7c1a3d79204214d16840f5035af929d /mesonbuild/dependencies/base.py | |
| parent | 893d101fff01d72e8df055491d8e609eb0fd8575 (diff) | |
| parent | bb0e18b73885de374f8461c0e4f3c911fded1e46 (diff) | |
| download | meson-357b34f9154ee3aae50d06d32ea6c4e0e152558c.zip meson-357b34f9154ee3aae50d06d32ea6c4e0e152558c.tar.gz meson-357b34f9154ee3aae50d06d32ea6c4e0e152558c.tar.bz2 | |
Merge pull request #2375 from centricular/gnome-gir-fixes
Fix GNOME gir generation with lists of dependency lists
Diffstat (limited to 'mesonbuild/dependencies/base.py')
| -rw-r--r-- | mesonbuild/dependencies/base.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 7c7f986..0d9742d 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -23,7 +23,7 @@ from enum import Enum from .. import mlog from .. import mesonlib -from ..mesonlib import MesonException, Popen_safe, flatten, version_compare_many, listify +from ..mesonlib import MesonException, Popen_safe, version_compare_many, listify # These must be defined in this file to avoid cyclical references. @@ -586,7 +586,7 @@ class ExtraFrameworkDependency(ExternalDependency): def get_dep_identifier(name, kwargs, want_cross): # Need immutable objects since the identifier will be used as a dict key - version_reqs = flatten(kwargs.get('version', [])) + version_reqs = listify(kwargs.get('version', [])) if isinstance(version_reqs, list): version_reqs = frozenset(version_reqs) identifier = (name, version_reqs, want_cross) @@ -599,7 +599,7 @@ def get_dep_identifier(name, kwargs, want_cross): continue # All keyword arguments are strings, ints, or lists (or lists of lists) if isinstance(value, list): - value = frozenset(flatten(value)) + value = frozenset(listify(value)) identifier += (key, value) return identifier |