aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2016-06-21 08:38:03 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2016-06-21 08:40:48 +0530
commitfe52feb47db2ce56c9c417d4282f13665fdec687 (patch)
treeca2eb673123a2672d9d1416346655e04aece24fa
parent10f6295ca81c15a8247dfbf6d105726e708c89a9 (diff)
downloadmeson-fe52feb47db2ce56c9c417d4282f13665fdec687.zip
meson-fe52feb47db2ce56c9c417d4282f13665fdec687.tar.gz
meson-fe52feb47db2ce56c9c417d4282f13665fdec687.tar.bz2
dependency: Fix version check for a not-found dependency
The check was wrong, and we were passing 'none' as the 'found' version to the version compare if the cached dep was a not-found dependency
-rw-r--r--mesonbuild/interpreter.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 7acff53..e114ab2 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1644,7 +1644,7 @@ class Interpreter():
if 'version' in kwargs:
wanted = kwargs['version']
found = cached_dep.get_version()
- if not found or not mesonlib.version_compare(found, wanted):
+ if not cached_dep.found() or not mesonlib.version_compare(found, wanted):
# Cached dep has the wrong version. Check if an external
# dependency or a fallback dependency provides it.
cached_dep = None