diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-03-01 18:17:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-01 18:17:41 +0200 |
| commit | 25cbcb19a9208ebf8f5cde3f8ecb91df0a2dfebf (patch) | |
| tree | cf29f0c60ac4014b9395edbe2a9c3efdad449291 /mesonbuild/interpreter.py | |
| parent | 74452f2a1c842291c893504876507946103ac77f (diff) | |
| parent | 96f661e15046a4222fd01a7216e18de901b73cb6 (diff) | |
| download | meson-25cbcb19a9208ebf8f5cde3f8ecb91df0a2dfebf.zip meson-25cbcb19a9208ebf8f5cde3f8ecb91df0a2dfebf.tar.gz meson-25cbcb19a9208ebf8f5cde3f8ecb91df0a2dfebf.tar.bz2 | |
Merge pull request #6627 from jon-turney/cwd-relative-file-locations
Consistently report file locations relative to cwd
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index c29ed89..a9e0a3b 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -3748,9 +3748,9 @@ This will become a hard error in the future.''' % kwargs['input'], location=self code = f.read() assert(isinstance(code, str)) try: - codeblock = mparser.Parser(code, self.subdir).parse() + codeblock = mparser.Parser(code, absname).parse() except mesonlib.MesonException as me: - me.file = buildfilename + me.file = absname raise me try: self.evaluate_codeblock(codeblock) |