Revert "interpreterbase: Add disabler exception for `get_variable` method"

This reverts commit 82fedf0403.
pull/14168/head
Jussi Pakkanen 4 months ago
parent 900a918287
commit cef9c33bba
  1. 2
      mesonbuild/interpreterbase/interpreterbase.py
  2. 5
      test cases/common/158 disabler/meson.build
  3. 2
      test cases/common/158 disabler/subprojects/bar/meson.build

@ -542,7 +542,7 @@ class InterpreterBase:
method_name = node.name.value method_name = node.name.value
(h_args, h_kwargs) = self.reduce_arguments(node.args) (h_args, h_kwargs) = self.reduce_arguments(node.args)
(args, kwargs) = self._unholder_args(h_args, h_kwargs) (args, kwargs) = self._unholder_args(h_args, h_kwargs)
if is_disabled(args, kwargs) and method_name != 'get_variable': if is_disabled(args, kwargs):
return Disabler() return Disabler()
if not isinstance(obj, InterpreterObject): if not isinstance(obj, InterpreterObject):
raise InvalidArguments(f'{object_display_name} is not callable.') raise InvalidArguments(f'{object_display_name} is not callable.')

@ -151,8 +151,3 @@ foreach k, i : {'a': true, 'b': disabler(), 'c': true}
endforeach endforeach
assert(loops == 3, 'Disabler in foreach dict') assert(loops == 3, 'Disabler in foreach dict')
assert(disablers == 1, 'Disabler in foreach dict') assert(disablers == 1, 'Disabler in foreach dict')
# https://github.com/mesonbuild/meson/issues/13717
bar_subproject = subproject('bar')
bar_dep = bar_subproject.get_variable('bar_dep', disabler())
assert(not is_disabler(bar_dep))

@ -1,2 +0,0 @@
project('bar')
bar_dep = declare_dependency()
Loading…
Cancel
Save