diff options
| author | Thibault Saunier <tsaunier@igalia.com> | 2018-08-18 08:31:12 -0300 |
|---|---|---|
| committer | Thibault Saunier <tsaunier@igalia.com> | 2018-08-18 09:04:08 -0300 |
| commit | a95763c715111053538434c0f1df87d5efcf4aad (patch) | |
| tree | e1552837d2ba52e38b9491b44e865a26b5dfbbac | |
| parent | 6ecd31af19dc537983311796929a9dd690632999 (diff) | |
| download | meson-a95763c715111053538434c0f1df87d5efcf4aad.zip meson-a95763c715111053538434c0f1df87d5efcf4aad.tar.gz meson-a95763c715111053538434c0f1df87d5efcf4aad.tar.bz2 | |
interpreter: Handle 'bool, str, int' values returned by modules
| -rw-r--r-- | mesonbuild/interpreter.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 707cf9e..e6dbb5c 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1974,7 +1974,7 @@ class Interpreter(InterpreterBase): return [self.holderify(x) for x in item] if isinstance(item, build.CustomTarget): return CustomTargetHolder(item, self) - elif isinstance(item, (int, str)) or item is None: + elif isinstance(item, (int, str, bool)) or item is None: return item elif isinstance(item, build.Executable): return ExecutableHolder(item, self) @@ -2018,6 +2018,8 @@ class Interpreter(InterpreterBase): self.process_new_values(v.sources[0]) elif hasattr(v, 'held_object'): pass + elif isinstance(v, (int, str, bool)): + pass else: raise InterpreterException('Module returned a value of unknown type.') |