summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-11 17:14:14 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-11 17:14:14 +0000
commit0761c88989af492ea2c48b9612cb856d53de3992 (patch)
treea89fbca536a1e154adbe5c4dfe7167a489451843
parent16cad2432acc307bb5a7877ea9862862144ca95f (diff)
parentdc874ce95a3d1b5d1f76f8ad6f315d57f8718770 (diff)
downloadmorph-0761c88989af492ea2c48b9612cb856d53de3992.tar.gz
Merge branch 'baserock/lauren/morph-version-message-fix'
Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk> Reviewed-By: Javier Jardón <javier.jardon@codethink.co.uk>
-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 8b68fda3..e0ab047a 100644
--- a/distbuild/initiator_connection.py
+++ b/distbuild/initiator_connection.py
@@ -107,8 +107,8 @@ class InitiatorConnection(distbuild.StateMachine):
reason=('Protocol version mismatch between server & '
'initiator: distbuild network uses distbuild '
'protocol version %i, but client uses version'
- ' %i.', distbuild.protocol.VERSION,
- event.msg.get('protocol_version')))
+ ' %i.' % (distbuild.protocol.VERSION,
+ event.msg.get('protocol_version'))))
self.jm.send(msg)
self._log_send(msg)
return