aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreter
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2021-11-29 23:35:58 -0500
committerEli Schwartz <eschwartz@archlinux.org>2021-11-30 00:16:14 -0500
commit0ac2e4bb90e4e6229b8c8ba8c0958d1126d1a01b (patch)
treec49bce8e355600bae60698f0745c7d180ce65e16 /mesonbuild/interpreter
parentc664d63ed1f170e7a83b894a92f75f2a86f276bf (diff)
downloadmeson-0ac2e4bb90e4e6229b8c8ba8c0958d1126d1a01b.zip
meson-0ac2e4bb90e4e6229b8c8ba8c0958d1126d1a01b.tar.gz
meson-0ac2e4bb90e4e6229b8c8ba8c0958d1126d1a01b.tar.bz2
fix broken FeatureNew checks that never printed
They passed the arguments in the wrong order, so the version parsed as the message and the message parsed as a version. While we are at it, pass the location node in too.
Diffstat (limited to 'mesonbuild/interpreter')
-rw-r--r--mesonbuild/interpreter/interpreterobjects.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/interpreter/interpreterobjects.py b/mesonbuild/interpreter/interpreterobjects.py
index b3dbe55..602623a 100644
--- a/mesonbuild/interpreter/interpreterobjects.py
+++ b/mesonbuild/interpreter/interpreterobjects.py
@@ -260,7 +260,7 @@ class EnvironmentVariablesHolder(ObjectHolder[build.EnvironmentVariables], Mutab
# Multiple append/prepend operations was not supported until 0.58.0.
if self.held_object.has_name(name):
m = f'Overriding previous value of environment variable {name!r} with a new one'
- FeatureNew('0.58.0', m).use(self.subproject)
+ FeatureNew(m, '0.58.0', location=self.current_node).use(self.subproject)
@typed_pos_args('environment.set', str, varargs=str, min_varargs=1)
@typed_kwargs('environment.set', _ENV_SEPARATOR_KW)
@@ -505,7 +505,7 @@ class DependencyHolder(ObjectHolder[Dependency]):
def variable_method(self, args: T.Tuple[T.Optional[str]], kwargs: T.Dict[str, T.Any]) -> T.Union[str, T.List[str]]:
default_varname = args[0]
if default_varname is not None:
- FeatureNew('0.58.0', 'Positional argument to dep.get_variable()').use(self.subproject)
+ FeatureNew('Positional argument to dep.get_variable()', '0.58.0', location=self.current_node).use(self.subproject)
for k in ['cmake', 'pkgconfig', 'configtool', 'internal']:
kwargs.setdefault(k, default_varname)
return self.held_object.get_variable(**kwargs)