diff options
author | Jürg Billeter <j@bitron.ch> | 2020-05-12 20:48:04 +0200 |
---|---|---|
committer | Jürg Billeter <j@bitron.ch> | 2020-05-12 21:13:31 +0200 |
commit | d25e21057721c76893a19fa31cc699de26ad55dc (patch) | |
tree | df8cf3105a8bb0c45b1eed8d39cba0efa5c096bd /src | |
parent | 3408afbf30595d9dc2b8269b2e8fffa8f039db9f (diff) | |
download | buildstream-d25e21057721c76893a19fa31cc699de26ad55dc.tar.gz |
_sandboxbuildboxrun.py: Pass --no-logs-capture to buildbox-runjuerg/no-logs-capture
buildbox-common master no longer forwards stdout/stderr of the action
command by default. The buildbox-run capabilities mechanism is used to
support old and new versions.
Diffstat (limited to 'src')
-rw-r--r-- | src/buildstream/sandbox/_sandboxbuildboxrun.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/buildstream/sandbox/_sandboxbuildboxrun.py b/src/buildstream/sandbox/_sandboxbuildboxrun.py index c10669fe0..3907b6f0d 100644 --- a/src/buildstream/sandbox/_sandboxbuildboxrun.py +++ b/src/buildstream/sandbox/_sandboxbuildboxrun.py @@ -105,6 +105,10 @@ class SandboxBuildBoxRun(SandboxREAPI): "--action-result={}".format(result_file.name), ] + # Do not redirect stdout/stderr + if "no-logs-capture" in self._capabilities: + buildbox_command.append("--no-logs-capture") + marked_directories = self._get_marked_directories() mount_sources = self._get_mount_sources() for mark in marked_directories: |