summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-02-11 12:34:27 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-02-11 12:53:58 +0000
commit5bf5bb1d8f719ac6759bbe8affac7665e24acb1e (patch)
tree142469648738a0fba4fd2628ea519afc96cf1355
parentd0143c276f31bf9de26dfbe92d64693cdcbd2014 (diff)
downloadmorph-5bf5bb1d8f719ac6759bbe8affac7665e24acb1e.tar.gz
distbuild: Simplify error when computing build graph fails
The previous error looked like this by the time it had reached the initiator's console: ERROR: Failed to build baserock:baserock/definitions c7292b7c81cdd7e5b9e85722406371748453c44f systems/base-system-x86_64-generic.morph.frodsham: Failed to compute build graph. Problem with serialise-artifact: ERROR: Couldn't find morphology: systems/base-system-x86_64-generic.morph.frodsham New message is at least a bit simpler: ERROR: Failed to build baserock:baserock/definitions c7292b7c81cdd7e5b9e85722406371748453c44f systems/base-system-x86_64-generic.morph.frodsham: ERROR: Couldn't find morphology: systems/base-system-x86_64-generic.morph.frodsham
-rw-r--r--distbuild/build_controller.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/distbuild/build_controller.py b/distbuild/build_controller.py
index 8dbbaef9..aeeda417 100644
--- a/distbuild/build_controller.py
+++ b/distbuild/build_controller.py
@@ -306,8 +306,7 @@ class BuildController(distbuild.StateMachine):
error_text = self._artifact_error.peek()
if event.msg['exit'] != 0 or error_text:
- self.fail('Failed to compute build graph. Problem with '
- 'serialise-artifact: %s' % error_text)
+ self.fail(error_text)
if event.msg['exit'] != 0:
return