From 1e69908be5fb738cd787f0e4825da395e9b356b2 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Wed, 3 Mar 2021 10:58:06 -0500 Subject: interpreter: Fix process_new_values() It should recurse on lists and does not need to return a value. --- mesonbuild/interpreter.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'mesonbuild') diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 5642242..570b34f 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2580,26 +2580,22 @@ class Interpreter(InterpreterBase): if isinstance(v, (build.BuildTarget, build.CustomTarget, build.RunTarget)): self.add_target(v.name, v) elif isinstance(v, list): - self.module_method_callback(v) - elif isinstance(v, build.GeneratedList): - pass + self.process_new_values(v) elif isinstance(v, ExecutableSerialisation): v.subproject = self.subproject self.build.install_scripts.append(v) elif isinstance(v, build.Data): self.build.data.append(v) - elif isinstance(v, dependencies.ExternalProgram): - return ExternalProgramHolder(v, self.subproject) elif isinstance(v, dependencies.InternalDependency): # FIXME: This is special cased and not ideal: # The first source is our new VapiTarget, the rest are deps self.process_new_values(v.sources[0]) elif isinstance(v, build.InstallDir): self.build.install_dirs.append(v) - return InstallDirHolder(v) elif isinstance(v, Test): self.build.tests.append(v) - elif isinstance(v, (int, str, bool, Disabler, ObjectHolder)): + elif isinstance(v, (int, str, bool, Disabler, ObjectHolder, build.GeneratedList, + dependencies.ExternalProgram)): pass else: raise InterpreterException('Module returned a value of unknown type.') -- cgit v1.1