diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2023-11-17 13:10:47 -0500 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2025-10-20 14:37:58 -0400 |
| commit | 5d496cc8b70188e38b1aa4dcc014e410c3484fe5 (patch) | |
| tree | a920b7a021148eae665605c60d6f68c7feb1be5f /mesonbuild/interpreterbase | |
| parent | 28e1684abaa8c6fe6e06048bf58f2b0e6b530763 (diff) | |
| download | meson-5d496cc8b70188e38b1aa4dcc014e410c3484fe5.tar.gz | |
interpreter: Fix extract_object subproject validation
Fixes: #12519
Diffstat (limited to 'mesonbuild/interpreterbase')
| -rw-r--r-- | mesonbuild/interpreterbase/interpreterbase.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/mesonbuild/interpreterbase/interpreterbase.py b/mesonbuild/interpreterbase/interpreterbase.py index 588932cad..f40a27e31 100644 --- a/mesonbuild/interpreterbase/interpreterbase.py +++ b/mesonbuild/interpreterbase/interpreterbase.py @@ -555,12 +555,6 @@ class InterpreterBase: return Disabler() if not isinstance(obj, InterpreterObject): raise InvalidArguments(f'{object_display_name} is not callable.') - # TODO: InterpreterBase **really** shouldn't be in charge of checking this - if method_name == 'extract_objects': - if isinstance(obj, ObjectHolder): - self.validate_extraction(obj.held_object) - elif not isinstance(obj, Disabler): - raise InvalidArguments(f'Invalid operation "extract_objects" on {object_display_name} of type {type(obj).__name__}') obj.current_node = self.current_node = node res = obj.method_call(method_name, args, kwargs) return self._holderify(res) if res is not None else None @@ -675,9 +669,6 @@ class InterpreterBase: return self.variables[varname] raise InvalidCode(f'Unknown variable "{varname}".') - def validate_extraction(self, buildtarget: mesonlib.HoldableObject) -> None: - raise InterpreterException('validate_extraction is not implemented in this context (please file a bug)') - def _load_option_file(self) -> None: from .. import optinterpreter # prevent circular import |
