aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreter
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2022-05-29 17:49:35 -0400
committerXavier Claessens <xclaesse@gmail.com>2022-05-30 12:26:19 -0400
commit37fea630338a93cf7b8b6e91a38d45431d92bc5b (patch)
tree3d5b043a9abe327dfd2c6684b98a3b756d1a7a2f /mesonbuild/interpreter
parent194c28297f3c5a75c4b9918b78742aaabb0a6703 (diff)
downloadmeson-37fea630338a93cf7b8b6e91a38d45431d92bc5b.zip
meson-37fea630338a93cf7b8b6e91a38d45431d92bc5b.tar.gz
meson-37fea630338a93cf7b8b6e91a38d45431d92bc5b.tar.bz2
fix invalid type for default_options
We have two checks for the type accepted here. One is the basic typed_kwargs type-checking, which declares it accepts: str | include_directories The other is the custom validator which further narrows it to strings with certain option-like properties (needs to be an = assignment). The former is obviously wrong, which doesn't really matter all that much but still isn't very nice... Introduced in commit f34013fb08b8d24d570c96084c5d58c5eaf4f5da.
Diffstat (limited to 'mesonbuild/interpreter')
-rw-r--r--mesonbuild/interpreter/type_checking.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/interpreter/type_checking.py b/mesonbuild/interpreter/type_checking.py
index ee6eef5..407e10d 100644
--- a/mesonbuild/interpreter/type_checking.py
+++ b/mesonbuild/interpreter/type_checking.py
@@ -328,7 +328,7 @@ INCLUDE_DIRECTORIES: KwargInfo[T.List[T.Union[str, IncludeDirs]]] = KwargInfo(
# for cases like default_options and override_options
DEFAULT_OPTIONS: KwargInfo[T.List[str]] = KwargInfo(
'default_options',
- ContainerTypeInfo(list, (str, IncludeDirs)),
+ ContainerTypeInfo(list, str),
listify=True,
default=[],
validator=_options_validator,