summaryrefslogtreecommitdiff
path: root/distbuild
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-04-14 14:06:57 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-04-14 14:06:57 +0000
commit78b46a60a5d482f0c302c83b200157cdb25730ca (patch)
treeca4ffee795b42a5e28c82ef5552f065c0f18ee5e /distbuild
parent0baae51e217f4999c1f068c458527d598284ddec (diff)
downloadmorph-78b46a60a5d482f0c302c83b200157cdb25730ca.tar.gz
Fix lines longer than 80 characters (my fault)
Diffstat (limited to 'distbuild')
-rw-r--r--distbuild/initiator_connection.py3
-rw-r--r--distbuild/jm.py4
-rw-r--r--distbuild/worker_build_scheduler.py6
3 files changed, 8 insertions, 5 deletions
diff --git a/distbuild/initiator_connection.py b/distbuild/initiator_connection.py
index e20e6d98..34f2bdaa 100644
--- a/distbuild/initiator_connection.py
+++ b/distbuild/initiator_connection.py
@@ -103,7 +103,8 @@ class InitiatorConnection(distbuild.StateMachine):
self._route_map.add(event.msg['id'], new_id)
event.msg['id'] = new_id
build_controller = distbuild.BuildController(
- self, event.msg, self.artifact_cache_server, self.morph_instance)
+ self, event.msg, self.artifact_cache_server,
+ self.morph_instance)
self.mainloop.add_state_machine(build_controller)
def _disconnect(self, event_source, event):
diff --git a/distbuild/jm.py b/distbuild/jm.py
index a4e366a7..69fa5bd1 100644
--- a/distbuild/jm.py
+++ b/distbuild/jm.py
@@ -45,8 +45,8 @@ class JsonMachine(StateMachine):
self.debug_json = False
def __repr__(self):
- return '<JsonMachine at 0x%x: socket %s, max_buffer %s>' % (id(self),
- self.conn, self.max_buffer)
+ return '<JsonMachine at 0x%x: socket %s, max_buffer %s>' % \
+ (id(self), self.conn, self.max_buffer)
def setup(self):
sockbuf = self.sockbuf = SocketBuffer(self.conn, self.max_buffer)
diff --git a/distbuild/worker_build_scheduler.py b/distbuild/worker_build_scheduler.py
index f17a4cf4..4ce5e437 100644
--- a/distbuild/worker_build_scheduler.py
+++ b/distbuild/worker_build_scheduler.py
@@ -235,7 +235,8 @@ class WorkerConnection(distbuild.StateMachine):
self._request_job(None, None)
def _maybe_cancel(self, event_source, build_cancel):
- logging.debug('WC: BuildController %r requested a cancel' % event_source)
+ logging.debug('WC: BuildController %r requested a cancel' %
+ event_source)
if build_cancel.id == self._initiator_id:
distbuild.crash_point()
@@ -285,7 +286,8 @@ class WorkerConnection(distbuild.StateMachine):
distbuild.crash_point()
- logging.debug('WC: from worker %s: %r' % (self._worker_name, event.msg))
+ logging.debug(
+ 'WC: from worker %s: %r' % (self._worker_name, event.msg))
handlers = {
'exec-output': self._handle_exec_output,