diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-04-04 20:39:00 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-04 20:39:00 +0300 |
| commit | 69a03fa94bb03bb6527ca0ab5a7b519784d35f71 (patch) | |
| tree | d38c18d3785c27d1b4e48107138fd4e16232a262 /mesonbuild/interpreter.py | |
| parent | 2cefe8fd41c5025fd4c1f17d63c7b36bc58d6e36 (diff) | |
| parent | c17ed429be9575a99d893a31cd7bf32dc428ede9 (diff) | |
| download | meson-69a03fa94bb03bb6527ca0ab5a7b519784d35f71.zip meson-69a03fa94bb03bb6527ca0ab5a7b519784d35f71.tar.gz meson-69a03fa94bb03bb6527ca0ab5a7b519784d35f71.tar.bz2 | |
Merge pull request #6843 from mensinda/ciJSONSCHEMA
CI: Maintain docker images with GitHub Actions
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.') |