diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2017-12-31 16:50:52 +0000 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-01-01 13:20:55 +0000 |
| commit | 2ed875e1b49d06d677d299534f2f8290bfbd3b35 (patch) | |
| tree | e71094f1c387a4b34ad5ba5c61d5c85ac776741f /mesonbuild/mparser.py | |
| parent | d4985d981fea5ec026745efb41be88f25d41bb32 (diff) | |
| download | meson-2ed875e1b49d06d677d299534f2f8290bfbd3b35.zip meson-2ed875e1b49d06d677d299534f2f8290bfbd3b35.tar.gz meson-2ed875e1b49d06d677d299534f2f8290bfbd3b35.tar.bz2 | |
Consolidate warning location formatting in mlog.warning()
Also use .format() rather than %
Also use build.environment rather than hardcoding 'meson.build'
Diffstat (limited to 'mesonbuild/mparser.py')
| -rw-r--r-- | mesonbuild/mparser.py | 5 |
1 files changed, 3 insertions, 2 deletions
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): |