diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-06-01 23:00:49 +0100 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-06-04 18:21:34 +0530 |
| commit | fb7168635dc551139fd2bae20e750cfce9e06416 (patch) | |
| tree | 5555d4c3fc3f9ca355771e2c6d56e4dab0aedf28 | |
| parent | 86476427d8b68c18c9c98cf7a5929642ea0e7adc (diff) | |
| download | meson-nirbheek/document-feature-new.tar.gz | |
Fix non-list used with FeatureNewKwargsnirbheek/document-feature-new
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 0bcb98fb2..bc661f376 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -1086,7 +1086,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 23e4efd7d..5a7202bca 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2824,7 +2824,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) |