diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2017-05-04 09:06:00 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2017-05-05 08:11:28 +1000 |
| commit | 7a3be163cbceb9f569ff454dc23fdfecadc166cc (patch) | |
| tree | be20093056b7bdfc46c71a4de59f7b6d3902b730 /mesonbuild/interpreter.py | |
| parent | 44131226761913bba297a0cf5d20d37d9408d02e (diff) | |
| download | meson-7a3be163cbceb9f569ff454dc23fdfecadc166cc.zip meson-7a3be163cbceb9f569ff454dc23fdfecadc166cc.tar.gz meson-7a3be163cbceb9f569ff454dc23fdfecadc166cc.tar.bz2 | |
Default to project_version() in vcs_tag fallback
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 fed3e10..0e3f039 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2024,9 +2024,9 @@ class Interpreter(InterpreterBase): def func_vcs_tag(self, node, args, kwargs): if 'input' not in kwargs or 'output' not in kwargs: raise InterpreterException('Keyword arguments input and output must exist') - fallback = kwargs.pop('fallback', None) + fallback = kwargs.pop('fallback', self.project_version) if not isinstance(fallback, str): - raise InterpreterException('Keyword argument fallback must exist and be a string.') + raise InterpreterException('Keyword argument fallback must be a string.') replace_string = kwargs.pop('replace_string', '@VCS_TAG@') regex_selector = '(.*)' # default regex selector for custom command: use complete output vcs_cmd = kwargs.get('command', None) |