diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-05-05 17:17:49 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-05 17:17:49 +0200 |
commit | bae7861c1c4ac2616c6f3b7b615aba782547e05c (patch) | |
tree | 130f2026257c238ff64b4e8e2ea737f3cca37638 /mesonbuild/interpreter.py | |
parent | c96557c9ed790ebe3c6205d143b7f8c75875236f (diff) | |
parent | 7a3be163cbceb9f569ff454dc23fdfecadc166cc (diff) | |
download | meson-bae7861c1c4ac2616c6f3b7b615aba782547e05c.zip meson-bae7861c1c4ac2616c6f3b7b615aba782547e05c.tar.gz meson-bae7861c1c4ac2616c6f3b7b615aba782547e05c.tar.bz2 |
Merge pull request #1722 from whot/doc-fixes
fixes for vcs_tag
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r-- | mesonbuild/interpreter.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index d8f3b2b..0e3f039 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2022,9 +2022,11 @@ class Interpreter(InterpreterBase): raise InterpreterException('Unknown target_type.') def func_vcs_tag(self, node, args, kwargs): - fallback = kwargs.pop('fallback', None) + if 'input' not in kwargs or 'output' not in kwargs: + raise InterpreterException('Keyword arguments input and output must exist') + 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) |