summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2015-05-13 10:42:20 +0100
committerBaserock Gerrit <gerrit@baserock.org>2015-05-13 14:47:31 +0000
commitd7e86046706680828b141a21a77ab95419dfb58f (patch)
treecfb9e54c19f14e7fead40f4158705e88bc9edcf6
parenteda5cb29d0200ee55c0ed50d2afe1a17dbd7577a (diff)
downloadmorph-d7e86046706680828b141a21a77ab95419dfb58f.tar.gz
Protocol check fix
This patch fixes an error where we can end up calling int(None) when we try to send an error response for a malformed message. Change-Id: Id3ee3298cfb6a5cb32e35fdc5916dab1e4c87a03
-rw-r--r--distbuild/initiator_connection.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/distbuild/initiator_connection.py b/distbuild/initiator_connection.py
index 1ec88897..6e6ea833 100644
--- a/distbuild/initiator_connection.py
+++ b/distbuild/initiator_connection.py
@@ -125,8 +125,8 @@ class InitiatorConnection(distbuild.StateMachine):
else:
response = (
'Protocol version mismatch between server & initiator: '
- 'distbuild network uses distbuild protocol version %i, '
- 'but client uses version %i.' %
+ 'distbuild network uses distbuild protocol version %s, '
+ 'but client uses version %s.' %
(distbuild.protocol.VERSION,
event.msg.get('protocol_version')))
self._refuse_build_request(event.msg, response)