aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreter/interpreter.py
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2021-06-28 17:22:14 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2021-07-02 17:14:44 +0300
commit971a0b1775ef80fc0877b3b90f75803f197c866b (patch)
tree40f206fa6112707dfc0600546c072e104a55c5e1 /mesonbuild/interpreter/interpreter.py
parent5bb93490c4c15198bcd230ecf64d3e5c5ef17951 (diff)
downloadmeson-971a0b1775ef80fc0877b3b90f75803f197c866b.zip
meson-971a0b1775ef80fc0877b3b90f75803f197c866b.tar.gz
meson-971a0b1775ef80fc0877b3b90f75803f197c866b.tar.bz2
fix: get_variable default variables are not ObjectHolders (fixes #8936)
Diffstat (limited to 'mesonbuild/interpreter/interpreter.py')
-rw-r--r--mesonbuild/interpreter/interpreter.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py
index 693924f..d37d5f7 100644
--- a/mesonbuild/interpreter/interpreter.py
+++ b/mesonbuild/interpreter/interpreter.py
@@ -26,7 +26,7 @@ from ..programs import ExternalProgram, NonExistingExternalProgram
from ..dependencies import Dependency
from ..depfile import DepFile
from ..interpreterbase import ContainerTypeInfo, InterpreterBase, KwargInfo, typed_kwargs, typed_pos_args
-from ..interpreterbase import noPosargs, noKwargs, stringArgs, permittedKwargs, noArgsFlattening, noSecondLevelHolderResolving, unholder_return
+from ..interpreterbase import noPosargs, noKwargs, stringArgs, permittedKwargs, noArgsFlattening, noSecondLevelHolderResolving, permissive_unholder_return
from ..interpreterbase import InterpreterException, InvalidArguments, InvalidCode, SubdirDoneRequest
from ..interpreterbase import Disabler, disablerIfNotFound
from ..interpreterbase import FeatureNew, FeatureDeprecated, FeatureNewKwargs, FeatureDeprecatedKwargs
@@ -2722,7 +2722,7 @@ This will become a hard error in the future.''', location=self.current_node)
@noKwargs
@noArgsFlattening
- @unholder_return
+ @permissive_unholder_return
def func_get_variable(self, node, args, kwargs):
if len(args) < 1 or len(args) > 2:
raise InvalidCode('Get_variable takes one or two arguments.')