summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2019-01-07 22:38:11 -0500
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2019-01-07 22:38:11 -0500
commit512c726e5996ccf979fd06a6e90fea65458a6225 (patch)
tree885fc7804fc311a9d3e60b8af139cd5ffdea2a12
parent3e3984adf2bee0d5804a1762895002ca3e29cb33 (diff)
downloadbuildstream-512c726e5996ccf979fd06a6e90fea65458a6225.tar.gz
sandbox/sandbox.py: Fix regression of command logging
Since we added batch commands, the batch commands print the text of the commands directly in the message text, but this is wrong. The detail string is the appropriate place for text of unknown lengths (the user can actually configure how many max lines of commands they want to see in their log), the message text itself should be controlled and brief enough to avoid text wrapping.
-rw-r--r--buildstream/sandbox/sandbox.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/buildstream/sandbox/sandbox.py b/buildstream/sandbox/sandbox.py
index f16772cce..617ebf5f5 100644
--- a/buildstream/sandbox/sandbox.py
+++ b/buildstream/sandbox/sandbox.py
@@ -592,7 +592,7 @@ class _SandboxBatch():
if command.label:
context = self.sandbox._get_context()
message = Message(self.sandbox._get_plugin_id(), MessageType.STATUS,
- 'Running {}'.format(command.label))
+ 'Running command', detail=command.label)
context.message(message)
exitcode = self.sandbox._run(command.command, self.flags, cwd=command.cwd, env=command.env)