diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-06-05 17:46:46 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-06-05 22:27:32 +0300 |
| commit | 94c6da33a760ecadc28ba4b54a703338038a580d (patch) | |
| tree | 413cdf04c8145f292b89ce0d4480bd8e0ef29571 /mesonbuild | |
| parent | 5465fc5e28e0435945e869a322a6fa66ed4cb070 (diff) | |
| download | meson-94c6da33a760ecadc28ba4b54a703338038a580d.zip meson-94c6da33a760ecadc28ba4b54a703338038a580d.tar.gz meson-94c6da33a760ecadc28ba4b54a703338038a580d.tar.bz2 | |
rewriter: Fix that default_options would not set the correct id
Currently default_options uses "" for the kwarks id, however this
is incorect and it must be "/". Additionally, this error won't be
ignored in the future with "--skip" (this is why the tests were
passing and this wasn't detected earlier).
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/rewriter.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/rewriter.py b/mesonbuild/rewriter.py index 1558cdd..a6860d5 100644 --- a/mesonbuild/rewriter.py +++ b/mesonbuild/rewriter.py @@ -447,7 +447,7 @@ class Rewriter: # First, remove the old values kwargs_cmd = { 'function': 'project', - 'id': "", + 'id': "/", 'operation': 'remove_regex', 'kwargs': { 'default_options': ['{}=.*'.format(x) for x in cmd['options'].keys()] @@ -502,7 +502,7 @@ class Rewriter: if cmd['function'] == 'project': if cmd['id'] != '/': mlog.error('The ID for the function type project must be "/"', *self.on_error()) - self.handle_error() + return self.handle_error() node = self.interpreter.project_node arg_node = node.args elif cmd['function'] == 'target': |