aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek.chauhan@gmail.com>2016-09-25 21:33:18 +0530
committerJussi Pakkanen <jpakkane@gmail.com>2016-09-25 19:03:18 +0300
commit9c6369c7593a33ccf1eaa0bd8628550a9c4d21e5 (patch)
treed39aa84c9c5ea02682198d5ce4e81685e7201aaa
parent5b34e560e54af215184040369b0b2807e7569ac3 (diff)
downloadmeson-9c6369c7593a33ccf1eaa0bd8628550a9c4d21e5.zip
meson-9c6369c7593a33ccf1eaa0bd8628550a9c4d21e5.tar.gz
meson-9c6369c7593a33ccf1eaa0bd8628550a9c4d21e5.tar.bz2
interpreter: Print an error if the fallback dependency variable is not found (#804)
-rw-r--r--mesonbuild/interpreter.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index b5da91f..4a76c94 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1818,9 +1818,12 @@ class Interpreter():
raise
else:
return None
- dep = self.subprojects[dirname].get_variable_method([varname], {})
+ try:
+ dep = self.subprojects[dirname].get_variable_method([varname], {})
+ except KeyError:
+ raise InterpreterException('Fallback variable {!r} in the subproject {!r} does not exist'.format(varname, dirname))
if not isinstance(dep, (DependencyHolder, InternalDependencyHolder)):
- raise InterpreterException('Fallback variable is not a dependency object.')
+ raise InterpreterException('Fallback variable {!r} in the subproject {!r} is not a dependency object.'.format(varname, dirname))
# Check if the version of the declared dependency matches what we want
if 'version' in kwargs:
wanted = kwargs['version']