diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-09-03 21:49:58 +0530 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-09-05 11:22:00 +0530 |
commit | 1fb631bf8f21d084006bdeb31858b94d514da933 (patch) | |
tree | 55c9f6d4f3a5b11fd0ae1bf932d90c73dbaaf1d3 /mesonbuild/interpreter.py | |
parent | a08a80d83a9dbcc50d2927ba63ccca4c926933a9 (diff) | |
download | meson-0.47.tar.gz |
Test + fix for not-found dependency fallback version comparison0.47
Fixes:
meson.build:6:0: ERROR: Uncomparable version string 'unknown'.
This was previously partially fixed in a8694f4b, which only fixed it
for cached fallback dependencies.
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r-- | mesonbuild/interpreter.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 6af9c049a..87f5695b3 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2990,7 +2990,8 @@ root and issuing %s. msg.append(traceback.format_exc()) mlog.log(*msg) return None - dep = self.get_subproject_dep(name, dirname, varname, kwargs.get('required', True)) + required = kwargs.get('required', True) + dep = self.get_subproject_dep(name, dirname, varname, required) if not dep: return None subproj_path = os.path.join(self.subproject_dir, dirname) @@ -2998,6 +2999,12 @@ root and issuing %s. if 'version' in kwargs: wanted = kwargs['version'] found = dep.version_method([], {}) + # Don't do a version check if the dependency is not found and not required + if not dep.found_method([], {}) and not required: + subproj_path = os.path.join(self.subproject_dir, dirname) + mlog.log('Dependency', mlog.bold(display_name), 'from subproject', + mlog.bold(subproj_path), 'found:', mlog.red('NO')) + return dep if not self.check_subproject_version(wanted, found): mlog.log('Subproject', mlog.bold(subproj_path), 'dependency', mlog.bold(display_name), 'version is', mlog.bold(found), |