From 7cd6206d9a8c686440209bee82e27c215dc4ece5 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sat, 27 Aug 2016 14:41:14 +0300 Subject: [PATCH] Check for embedded @OUTPUT@s in commands. --- mesonbuild/build.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mesonbuild/build.py b/mesonbuild/build.py index ace48538e..fc9febd1f 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):