Skip to content

Commit 9de6a50

Browse files
eli-schwartznirbheek
authored andcommitted
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.
1 parent 40c978c commit 9de6a50

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

mesonbuild/interpreter/interpreter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -608,11 +608,11 @@ def extract_variables(self, kwargs, argname='variables', list_new=False, dict_ne
608608
variables = kwargs.get(argname, {})
609609
if isinstance(variables, dict):
610610
if dict_new and variables:
611-
FeatureNew.single_use('variables as dictionary', '0.56.0', self.subproject)
611+
FeatureNew.single_use(f'{argname} as dictionary', '0.56.0', self.subproject)
612612
else:
613613
varlist = mesonlib.stringlistify(variables)
614614
if list_new:
615-
FeatureNew.single_use('variables as list of strings', '0.56.0', self.subproject)
615+
FeatureNew.single_use(f'{argname} as list of strings', '0.56.0', self.subproject)
616616
variables = collections.OrderedDict()
617617
for v in varlist:
618618
try:

0 commit comments

Comments
 (0)