pkgconfig module: fix incorrect Feature logging for uninstalled_variables

The utility function that processes this for both 'variables' and
'uninstalled_variables' accepts a kwarg for the name of the argument,
but then hardcodes 'variables' in the warning message. This is
misleading.
pull/10112/head
Eli Schwartz 3 years ago committed by Nirbheek Chauhan
parent 40c978c511
commit 9de6a501d7
  1. 4
      mesonbuild/interpreter/interpreter.py

@ -608,11 +608,11 @@ class Interpreter(InterpreterBase, HoldableObject):
variables = kwargs.get(argname, {})
if isinstance(variables, dict):
if dict_new and variables:
FeatureNew.single_use('variables as dictionary', '0.56.0', self.subproject)
FeatureNew.single_use(f'{argname} as dictionary', '0.56.0', self.subproject)
else:
varlist = mesonlib.stringlistify(variables)
if list_new:
FeatureNew.single_use('variables as list of strings', '0.56.0', self.subproject)
FeatureNew.single_use(f'{argname} as list of strings', '0.56.0', self.subproject)
variables = collections.OrderedDict()
for v in varlist:
try:

Loading…
Cancel
Save