diff options
Diffstat (limited to 'mesonbuild/interpreter')
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 5 | ||||
| -rw-r--r-- | mesonbuild/interpreter/kwargs.py | 1 | ||||
| -rw-r--r-- | mesonbuild/interpreter/type_checking.py | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 211af2b2e..118acce53 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -1787,7 +1787,6 @@ class Interpreter(InterpreterBase, HoldableObject): search_dirs=search_dirs) # When adding kwargs, please check if they make sense in dependencies.get_dep_identifier() - @FeatureNewKwargs('dependency', '0.50.0', ['not_found_message']) @FeatureNewKwargs('dependency', '0.49.0', ['disabler']) @disablerIfNotFound @permittedKwargs(permitted_dependency_kwargs) @@ -1801,9 +1800,7 @@ class Interpreter(InterpreterBase, HoldableObject): default_options = kwargs.get('default_options') df = DependencyFallbacksHolder(self, names, kwargs['allow_fallback'], default_options) df.set_fallback(kwargs['fallback']) - not_found_message = kwargs.get('not_found_message', '') - if not isinstance(not_found_message, str): - raise InvalidArguments('The not_found_message must be a string.') + not_found_message = kwargs['not_found_message'] try: d = df.lookup(kwargs) except Exception: diff --git a/mesonbuild/interpreter/kwargs.py b/mesonbuild/interpreter/kwargs.py index b82a3eec5..d193c593d 100644 --- a/mesonbuild/interpreter/kwargs.py +++ b/mesonbuild/interpreter/kwargs.py @@ -506,3 +506,4 @@ class FuncDependency(TypedDict): method: DependencyMethods modules: T.List[str] native: MachineChoice + not_found_message: str diff --git a/mesonbuild/interpreter/type_checking.py b/mesonbuild/interpreter/type_checking.py index 8e20b7e4f..f22135a02 100644 --- a/mesonbuild/interpreter/type_checking.py +++ b/mesonbuild/interpreter/type_checking.py @@ -947,4 +947,5 @@ DEPENDENCY_KWS: T.List[KwargInfo] = [ validator=lambda x: 'Must be a valid language if set' if (x is not None and x not in compilers.all_languages) else None), KwargInfo('main', bool, default=False), KwargInfo('modules', ContainerTypeInfo(list, str), listify=True, default=[]), + KwargInfo('not_found_message', str, default='', since='0.50.0'), ] |