diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-01-01 02:09:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-01 02:09:45 +0200 |
| commit | f2b33b8dcba7e8d948982cfb682e003d57e0f696 (patch) | |
| tree | 9be32002857e496701a622935c6587c682944c53 /mesonbuild | |
| parent | dd3f49af0d8c94033e6db68b25c23ea9e63e9c5c (diff) | |
| parent | ad5cc2ce5523d38578e9ca19179687434d050f3d (diff) | |
| download | meson-f2b33b8dcba7e8d948982cfb682e003d57e0f696.zip meson-f2b33b8dcba7e8d948982cfb682e003d57e0f696.tar.gz meson-f2b33b8dcba7e8d948982cfb682e003d57e0f696.tar.bz2 | |
Merge pull request #2852 from jon-turney/warning-location
Add filename and lineno to duplicate kwargs warning
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/interpreter.py | 2 | ||||
| -rw-r--r-- | mesonbuild/mparser.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index e5238a7..e8fb081 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1935,7 +1935,7 @@ to directly access options of other subprojects.''') @noKwargs def func_warning(self, node, args, kwargs): argstr = self.get_message_string_arg(node) - mlog.warning(argstr) + mlog.warning('%s in file %s, line %d' % (argstr, os.path.join(node.subdir, 'meson.build'), node.lineno)) @noKwargs def func_error(self, node, args, kwargs): diff --git a/mesonbuild/mparser.py b/mesonbuild/mparser.py index 0465d24..782b7a7 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 re +import os, re from .mesonlib import MesonException from . import mlog @@ -368,7 +368,7 @@ class ArgumentNode: def set_kwarg(self, name, value): if name in self.kwargs: - mlog.warning('Keyword argument "%s" defined multiple times. This will be a an error in future Meson releases.' % name) + 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)) self.kwargs[name] = value def num_args(self): |