From f31679deddf9d3a311e72c80c4442a9049467a03 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Fri, 1 Jun 2018 23:00:49 +0100 Subject: [PATCH] Fix non-list used with FeatureNewKwargs The type of this argument needs checking, or single strings need handling correctly. --- mesonbuild/build.py | 2 +- mesonbuild/interpreter.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mesonbuild/build.py b/mesonbuild/build.py index c5e50da72..4b423651b 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -1091,7 +1091,7 @@ recommended as it can lead to undefined behaviour on some platforms''') return class Generator: - @FeatureNewKwargs('generator', '0.43.0', 'capture') + @FeatureNewKwargs('generator', '0.43.0', ['capture']) def __init__(self, args, kwargs): if len(args) != 1: raise InvalidArguments('Generator requires exactly one positional argument: the executable') diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index c2dcfc5c9..26405e2b6 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2832,7 +2832,7 @@ root and issuing %s. mlog.bold(subproj_path), 'found:', mlog.green('YES')) return dep - @FeatureNewKwargs('executable', '0.42.0', 'implib') + @FeatureNewKwargs('executable', '0.42.0', ['implib']) @permittedKwargs(permitted_kwargs['executable']) def func_executable(self, node, args, kwargs): return self.build_target(node, args, kwargs, ExecutableHolder)