diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2019-11-20 12:25:48 -0500 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2019-11-26 11:31:48 -0500 |
| commit | 80dd3e30ce7c33912bb91a621881f96d44ca49ef (patch) | |
| tree | fa0a3823167de9a2ad31776710e21e5390ff8005 /mesonbuild/interpreter.py | |
| parent | 7dd302773dd2d6443ab52d608d1c86aef578f280 (diff) | |
| download | meson-80dd3e30ce7c33912bb91a621881f96d44ca49ef.zip meson-80dd3e30ce7c33912bb91a621881f96d44ca49ef.tar.gz meson-80dd3e30ce7c33912bb91a621881f96d44ca49ef.tar.bz2 | |
Fix crash when checking multi version on subproject dep
Also harminize a bit the logged message.
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 618f55b..6f541b2 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -3020,7 +3020,7 @@ external dependencies (including libraries) must go to "dependencies".''') return identifier, cached_dep # Verify the cached dep version match - wanted_vers = kwargs.get('version', []) + wanted_vers = mesonlib.stringlistify(kwargs.get('version', [])) found_vers = cached_dep.get_version() if not wanted_vers or mesonlib.version_compare_many(found_vers, wanted_vers)[0]: info = [mlog.blue('(cached)')] @@ -3034,7 +3034,7 @@ external dependencies (including libraries) must go to "dependencies".''') @staticmethod def check_subproject_version(wanted, found): - if wanted == 'undefined': + if not wanted: return True if found == 'undefined' or not mesonlib.version_compare_many(found, wanted)[0]: return False @@ -3057,7 +3057,7 @@ external dependencies (including libraries) must go to "dependencies".''') 'not a dependency object.'.format(varname, dirname)) required = kwargs.get('required', True) - wanted = kwargs.get('version', 'undefined') + wanted = mesonlib.stringlistify(kwargs.get('version', [])) subproj_path = os.path.join(self.subproject_dir, dirname) if not dep.found(): @@ -3076,9 +3076,10 @@ external dependencies (including libraries) must go to "dependencies".''') 'cached, requested incompatible version {} for ' 'dep {}'.format(found, dirname, wanted, display_name)) - mlog.log('Subproject', mlog.bold(subproj_path), 'dependency', - mlog.bold(display_name), 'version is', mlog.normal_cyan(found), - 'but', mlog.bold(wanted), 'is required.') + mlog.log('Dependency', mlog.bold(display_name), 'from subproject', + mlog.bold(subproj_path), 'found:', mlog.red('NO'), + 'found', mlog.normal_cyan(found), 'but need:', + mlog.bold(', '.join(["'{}'".format(e) for e in wanted]))) return self.notfound_dependency() found = mlog.normal_cyan(found) if found else None |