summaryrefslogtreecommitdiff
path: root/distbuild
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-04-10 07:49:56 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-04-14 11:19:06 +0300
commit0c3323ba9bb76907288b1b8ff58d50baf8e153b1 (patch)
tree2eafee6cf8560a7c6afd898d96aecaabcf48dfcb /distbuild
parent1a09b23eeae5056a8a43a24e917b0fecf12aba26 (diff)
downloadmorph-0c3323ba9bb76907288b1b8ff58d50baf8e153b1.tar.gz
distbuild: Fix possible 'one user disconnecting breaks all builds' issue
This is similar to the issue fixed by commit c38b77bed86acc8b90f253ce354f3ecf98e475e7.
Diffstat (limited to 'distbuild')
-rw-r--r--distbuild/build_controller.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/distbuild/build_controller.py b/distbuild/build_controller.py
index f7786c8f..4515ffc6 100644
--- a/distbuild/build_controller.py
+++ b/distbuild/build_controller.py
@@ -182,7 +182,7 @@ class BuildController(distbuild.StateMachine):
'annotating', self._start_annotating),
('graphing', self, _GraphFailed, None, None),
('graphing', distbuild.InitiatorConnection,
- distbuild.InitiatorDisconnect, None,
+ distbuild.InitiatorDisconnect, 'graphing',
self._maybe_abort),
('annotating', distbuild.HelperRouter, distbuild.HelperResult,
@@ -190,7 +190,7 @@ class BuildController(distbuild.StateMachine):
('annotating', self, _Annotated, 'building',
self._queue_worker_builds),
('annotating', distbuild.InitiatorConnection,
- distbuild.InitiatorDisconnect, None,
+ distbuild.InitiatorDisconnect, 'annotating',
self._maybe_abort),
# The exact WorkerConnection that is doing our building changes