diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-06-01 23:00:49 +0100 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-06-05 15:57:57 +0000 |
| commit | f31679deddf9d3a311e72c80c4442a9049467a03 (patch) | |
| tree | 11a52eabdd61cbc6002086bc3602d2eea850c5d4 | |
| parent | 48d49afe31573aeef70fba060a4e81556b8fedc4 (diff) | |
| download | meson-f31679deddf9d3a311e72c80c4442a9049467a03.zip meson-f31679deddf9d3a311e72c80c4442a9049467a03.tar.gz meson-f31679deddf9d3a311e72c80c4442a9049467a03.tar.bz2 | |
Fix non-list used with FeatureNewKwargs
The type of this argument needs checking, or single strings need handling correctly.
| -rw-r--r-- | mesonbuild/build.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreter.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index c5e50da..4b42365 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 c2dcfc5..26405e2 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) |