diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-08-27 14:41:14 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-08-27 14:41:14 +0300 |
| commit | 7cd6206d9a8c686440209bee82e27c215dc4ece5 (patch) | |
| tree | 25b4f30a0eab0867f7dc9e4d8c52bd2a72a4170a | |
| parent | ae126565559bd9053a2f254767094b49d3e69ca4 (diff) | |
| download | meson-7cd6206d9a8c686440209bee82e27c215dc4ece5.zip meson-7cd6206d9a8c686440209bee82e27c215dc4ece5.tar.gz meson-7cd6206d9a8c686440209bee82e27c215dc4ece5.tar.bz2 | |
Check for embedded @OUTPUT@s in commands.
| -rw-r--r-- | mesonbuild/build.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index ace4853..fc9febd 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -1015,9 +1015,10 @@ class CustomTarget: else: raise InvalidArguments('Argument %s in "command" is invalid.' % i) self.command = final_cmd - if self.capture and '@OUTPUT@' in self.command: - raise InvalidArguments( - '@OUTPUT@ is not allowed when capturing output.') + if self.capture: + for c in self.command: + if isinstance(c, str) and '@OUTPUT@' in c: + raise InvalidArguments('@OUTPUT@ is not allowed when capturing output.') if 'install' in kwargs: self.install = kwargs['install'] if not isinstance(self.install, bool): |