aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreter.py
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2016-05-30 02:20:33 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2016-05-30 03:35:02 +0530
commitf2256ba0980d1d5eb22b202dacc15abd9249339a (patch)
tree624fbeeb6032b9e22823cdc7264f3bf4692f6241 /mesonbuild/interpreter.py
parent76d88259bde4e8d28d18c66c171fa6625d129a79 (diff)
downloadmeson-f2256ba0980d1d5eb22b202dacc15abd9249339a.zip
meson-f2256ba0980d1d5eb22b202dacc15abd9249339a.tar.gz
meson-f2256ba0980d1d5eb22b202dacc15abd9249339a.tar.bz2
interpreter: Check if subproject version is defined before comparing
Without this Meson gives a cryptic error emitted from inside mesonlib.version_compare()
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r--mesonbuild/interpreter.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 8d260f0..5a99e1c 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1354,7 +1354,7 @@ class Interpreter():
if 'version' in kwargs:
pv = subi.project_version
wanted = kwargs['version']
- if not mesonlib.version_compare(pv, wanted):
+ if pv == 'undefined' or not mesonlib.version_compare(pv, wanted):
raise InterpreterException('Subproject %s version is %s but %s required.' % (dirname, pv, wanted))
self.active_projectname = current_active
mlog.log('\nSubproject', mlog.bold(dirname), 'finished.')