diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-04-02 10:57:48 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-04-02 10:57:48 +0200 |
| commit | 570adf09008b6379c786febb56f335a67980cfdf (patch) | |
| tree | 17c04f71d2bbbbb14fd5b1a8dbfdbd959959d0c3 /mesonbuild/interpreter.py | |
| parent | 3b1353ce819fece543252458f8409f7eb65ff3ae (diff) | |
| download | meson-570adf09008b6379c786febb56f335a67980cfdf.zip meson-570adf09008b6379c786febb56f335a67980cfdf.tar.gz meson-570adf09008b6379c786febb56f335a67980cfdf.tar.bz2 | |
interpreter: Fix Disabler support for modules
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 09e213e..ec28f2e 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2352,7 +2352,7 @@ class Interpreter(InterpreterBase): if isinstance(item, build.CustomTarget): return CustomTargetHolder(item, self) - elif isinstance(item, (int, str, bool)) or item is None: + elif isinstance(item, (int, str, bool, Disabler)) or item is None: return item elif isinstance(item, build.Executable): return ExecutableHolder(item, self) @@ -2397,7 +2397,7 @@ class Interpreter(InterpreterBase): self.process_new_values(v.sources[0]) elif hasattr(v, 'held_object'): pass - elif isinstance(v, (int, str, bool)): + elif isinstance(v, (int, str, bool, Disabler)): pass else: raise InterpreterException('Module returned a value of unknown type.') |