Skip to content

Commit cef9c33

Browse files
committed
Revert "interpreterbase: Add disabler exception for get_variable method"
This reverts commit 82fedf0.
1 parent 900a918 commit cef9c33

File tree

3 files changed

+1
-8
lines changed

3 files changed

+1
-8
lines changed

mesonbuild/interpreterbase/interpreterbase.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ def method_call(self, node: mparser.MethodNode) -> T.Optional[InterpreterObject]
542542
method_name = node.name.value
543543
(h_args, h_kwargs) = self.reduce_arguments(node.args)
544544
(args, kwargs) = self._unholder_args(h_args, h_kwargs)
545-
if is_disabled(args, kwargs) and method_name != 'get_variable':
545+
if is_disabled(args, kwargs):
546546
return Disabler()
547547
if not isinstance(obj, InterpreterObject):
548548
raise InvalidArguments(f'{object_display_name} is not callable.')

test cases/common/158 disabler/meson.build

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,3 @@ foreach k, i : {'a': true, 'b': disabler(), 'c': true}
151151
endforeach
152152
assert(loops == 3, 'Disabler in foreach dict')
153153
assert(disablers == 1, 'Disabler in foreach dict')
154-
155-
# https://github.com/mesonbuild/meson/issues/13717
156-
bar_subproject = subproject('bar')
157-
bar_dep = bar_subproject.get_variable('bar_dep', disabler())
158-
assert(not is_disabler(bar_dep))

test cases/common/158 disabler/subprojects/bar/meson.build

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)