aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/mparser.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2018-01-03 22:32:40 +0200
committerGitHub <noreply@github.com>2018-01-03 22:32:40 +0200
commit65f78a722ad0f8ab260e7cf24636ef38e8bd957f (patch)
tree76024acbc0c7d90e8edd69ad07c79124de622a46 /mesonbuild/mparser.py
parentc814f1145bc521efd0a46b033751a6f844d24df5 (diff)
parentbcc95d7dd703779228ec81b92197e010d0e5a1ea (diff)
downloadmeson-65f78a722ad0f8ab260e7cf24636ef38e8bd957f.zip
meson-65f78a722ad0f8ab260e7cf24636ef38e8bd957f.tar.gz
meson-65f78a722ad0f8ab260e7cf24636ef38e8bd957f.tar.bz2
Merge pull request #2856 from jon-turney/warning-location
Consolidate warning location formatting
Diffstat (limited to 'mesonbuild/mparser.py')
-rw-r--r--mesonbuild/mparser.py5
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):