diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-11 10:41:49 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-11 10:41:49 +0000 |
| commit | 68395a12c79c22e266b4a06095533e38da6e29d0 (patch) | |
| tree | f004fb3122bac502b127faf70e868bd56a0cb409 /distbuild/initiator_connection.py | |
| parent | 11559bbbd24c218d512d503df27157668b37bdc9 (diff) | |
| parent | eba2e42855e9413f035e5093d64543184dce6fae (diff) | |
| download | morph-68395a12c79c22e266b4a06095533e38da6e29d0.tar.gz | |
Merge branch 'sam/distbuild-build-logs'
Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk>
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
Diffstat (limited to 'distbuild/initiator_connection.py')
| -rw-r--r-- | distbuild/initiator_connection.py | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/distbuild/initiator_connection.py b/distbuild/initiator_connection.py index 86df28f1..8b68fda3 100644 --- a/distbuild/initiator_connection.py +++ b/distbuild/initiator_connection.py @@ -1,6 +1,6 @@ # distbuild/initiator_connection.py -- communicate with initiator # -# Copyright (C) 2012, 2014 - 2015 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -77,8 +77,6 @@ class InitiatorConnection(distbuild.StateMachine): 'idle', self._send_build_failed_message), ('idle', distbuild.BuildController, distbuild.BuildProgress, 'idle', self._send_build_progress_message), - ('idle', distbuild.BuildController, distbuild.BuildSteps, - 'idle', self._send_build_steps_message), ('idle', distbuild.BuildController, distbuild.BuildStepStarted, 'idle', self._send_build_step_started_message), ('idle', distbuild.BuildController, @@ -180,26 +178,6 @@ class InitiatorConnection(distbuild.StateMachine): self.jm.send(msg) self._log_send(msg) - def _send_build_steps_message(self, event_source, event): - - def make_step_dict(artifact): - return { - 'name': distbuild.build_step_name(artifact), - 'build-depends': [ - distbuild.build_step_name(x) - for x in artifact.source.dependencies - ] - } - - if event.id in self.our_ids: - step_names = distbuild.map_build_graph( - event.artifact, make_step_dict) - msg = distbuild.message('build-steps', - id=self._route_map.get_incoming_id(event.id), - steps=step_names) - self.jm.send(msg) - self._log_send(msg) - def _send_build_step_started_message(self, event_source, event): logging.debug('InitiatorConnection: build_step_started: ' 'id=%s step_name=%s worker_name=%s' % |