diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2022-01-26 19:53:20 -0500 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2022-01-27 13:01:48 -0800 |
| commit | fa4f96427a02b3b52499c3f38a6982d0230c147b (patch) | |
| tree | 53d68b309e429c98f9faab17cf40557045e7ad80 | |
| parent | 7e0004d8cf895237f4fb0ccc725fcbc2eccff966 (diff) | |
| download | meson-fa4f96427a02b3b52499c3f38a6982d0230c147b.zip meson-fa4f96427a02b3b52499c3f38a6982d0230c147b.tar.gz meson-fa4f96427a02b3b52499c3f38a6982d0230c147b.tar.bz2 | |
remove incorrect deprecated feature for vcs_tag
In commit 06481666f4e74ecef01e59351fc345ab0962d998 this warning got
moved from build.py to the interpreter. Unfortunately it got added to
the wrong function... it is supposed to be part of custom_target and
even mentions this as the feature_name.
Since then, build_always became a KwargInfo and has the deprecated-since
attribute baked into it. But it didn't have the additional message which
it really should have.
Add that message at the same time we remove it from vcs_tag.
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreter/type_checking.py | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 20e1902..28601b9 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -1663,8 +1663,6 @@ external dependencies (including libraries) must go to "dependencies".''') raise InterpreterException('Unknown target_type.') @permittedKwargs({'input', 'output', 'fallback', 'command', 'replace_string'}) - @FeatureDeprecatedKwargs('custom_target', '0.47.0', ['build_always'], - 'combine build_by_default and build_always_stale instead.') @noPosargs def func_vcs_tag(self, node, args, kwargs): if 'input' not in kwargs or 'output' not in kwargs: diff --git a/mesonbuild/interpreter/type_checking.py b/mesonbuild/interpreter/type_checking.py index 897315d..52a9005 100644 --- a/mesonbuild/interpreter/type_checking.py +++ b/mesonbuild/interpreter/type_checking.py @@ -285,6 +285,7 @@ CT_BUILD_BY_DEFAULT: KwargInfo[T.Optional[bool]] = KwargInfo('build_by_default', CT_BUILD_ALWAYS: KwargInfo[T.Optional[bool]] = KwargInfo( 'build_always', (bool, NoneType), deprecated='0.47.0', + deprecated_message='combine build_by_default and build_always_stale instead.', ) CT_BUILD_ALWAYS_STALE: KwargInfo[T.Optional[bool]] = KwargInfo( |