diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-02-16 14:17:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-16 14:17:49 +0200 |
| commit | 939b011114838b886d48521806988973205aecb4 (patch) | |
| tree | 77eef03f5c136867100ded7dfcfcaa442b184f33 /mesonbuild/ast/interpreter.py | |
| parent | 3ac7df6a6a016cf3ae92494bb510cbc4005571ed (diff) | |
| parent | 0ce02b57d71bf4365e30063efa95a0a414a4a92a (diff) | |
| download | meson-939b011114838b886d48521806988973205aecb4.zip meson-939b011114838b886d48521806988973205aecb4.tar.gz meson-939b011114838b886d48521806988973205aecb4.tar.bz2 | |
Merge pull request #4858 from mensinda/rwKWARGS
rewriter: Add support for kwargs modification
Diffstat (limited to 'mesonbuild/ast/interpreter.py')
| -rw-r--r-- | mesonbuild/ast/interpreter.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/ast/interpreter.py b/mesonbuild/ast/interpreter.py index 68c017a..ce4b93c 100644 --- a/mesonbuild/ast/interpreter.py +++ b/mesonbuild/ast/interpreter.py @@ -113,7 +113,7 @@ class AstInterpreter(interpreterbase.InterpreterBase): prev_subdir = self.subdir subdir = os.path.join(prev_subdir, args[0]) absdir = os.path.join(self.source_root, subdir) - buildfilename = os.path.join(self.subdir, environment.build_filename) + buildfilename = os.path.join(subdir, environment.build_filename) absname = os.path.join(self.source_root, buildfilename) symlinkless_dir = os.path.realpath(absdir) if symlinkless_dir in self.visited_subdirs: @@ -128,7 +128,7 @@ class AstInterpreter(interpreterbase.InterpreterBase): code = f.read() assert(isinstance(code, str)) try: - codeblock = mparser.Parser(code, self.subdir).parse() + codeblock = mparser.Parser(code, subdir).parse() except mesonlib.MesonException as me: me.file = buildfilename raise me |