From 9de6a501d78597a0fed7ee8425476ec5a22f7354 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Tue, 25 Jan 2022 21:45:49 -0500 Subject: [PATCH] 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. --- mesonbuild/interpreter/interpreter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 841978095..0e174d4c2 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/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: