Trivial logging bugs

[warsaw]

We found this failure when we tried to build the package in Ubuntu, which runs the full test suite:

https://launchpadlibrarian.net/117069272/buildlog_ubuntu-quantal-i386.python-tx-tftp_0.1~bzr31-0ubuntu4_FAILEDTOBUILD.txt.gz

Scroll down to see the tracebacks. The fix is pretty trivial, and applied to our Ubuntu 12.10 version of the package, it allows the test suite to pass and thus build.

[warsaw]

Sorry, I have no idea how to attach a patch to Github, so here's the patch:

--- a/tftp/session.py
+++ b/tftp/session.py
@@ -69,7 +69,7 @@
         if datagram.opcode == OP_DATA:
             return self.tftp_DATA(datagram)
         elif datagram.opcode == OP_ERROR:
-            log.msg("Got error: " % datagram)
+            log.msg("Got error: %s" % datagram)
             self.cancel()

     def tftp_DATA(self, datagram):
@@ -211,7 +211,7 @@
         if datagram.opcode == OP_ACK:
             return self.tftp_ACK(datagram)
         elif datagram.opcode == OP_ERROR:
-            log.msg("Got error: " % datagram)
+            log.msg("Got error: %s" % datagram)
             self.cancel()

     def tftp_ACK(self, datagram):

[shylent]

Thanks for the heads up. Fixed in 5c57fda

[jtv]

We just hit another instance in bootstrap.py, TFTPBootstrap.tftp_ERROR. Exactly the same code, so easy to find:

log.msg("Got error: " % datagram)

[shylent]

Well, that was shameful. Fixed in fe9aba2.

[jtv]

Thank you. :)