From 2ed875e1b49d06d677d299534f2f8290bfbd3b35 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Sun, 31 Dec 2017 16:50:52 +0000 Subject: Consolidate warning location formatting in mlog.warning() Also use .format() rather than % Also use build.environment rather than hardcoding 'meson.build' --- mesonbuild/mparser.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mesonbuild/mparser.py') diff --git a/mesonbuild/mparser.py b/mesonbuild/mparser.py index 782b7a7..eb03393 100644 --- a/mesonbuild/mparser.py +++ b/mesonbuild/mparser.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import os, re +import re from .mesonlib import MesonException from . import mlog @@ -368,7 +368,8 @@ class ArgumentNode: def set_kwarg(self, name, value): if name in self.kwargs: - mlog.warning('Keyword argument "%s" defined multiple times in file %s, line %d. This will be an error in future Meson releases.' % (name, os.path.join(self.subdir, 'meson.build'), self.lineno)) + mlog.warning('Keyword argument "{}" defined multiple times'.format(name), location=self) + mlog.warning('This will be an error in future Meson releases.') self.kwargs[name] = value def num_args(self): -- cgit v1.1