launchpad-reviewers team mailing list archive

["Jeroen T. Vermeulen" <jtv@xxxxxxxxxxxxx>]

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/bug-1062031 into lp:maas.

Commit message:
Fix 3 instances of a silly logging bug in tx-tftp (one that we were running into and two that have just been fixed upstream).  Bug is: https://github.com/shylent/python-tx-tftp/issues/8

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1062031 in MAAS: "pserv is oopsing: "exceptions.TypeError: not all arguments converted during string formatting""
  https://bugs.launchpad.net/maas/+bug/1062031

For more details, see:
https://code.launchpad.net/~jtv/maas/bug-1062031/+merge/128205

Reported upstream and patched locally, as agreed with Julian.  I didn't quite file a new bug, because I don't want to make upstream feel we're snowing them under; but I added a note on the bug for the two already-fixed instances.


Jeroen
-- 
https://code.launchpad.net/~jtv/maas/bug-1062031/+merge/128205
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/maas/bug-1062031 into lp:maas.

=== modified file 'contrib/python-tx-tftp/tftp/bootstrap.py'
--- contrib/python-tx-tftp/tftp/bootstrap.py	2012-08-22 11:00:12 +0000
+++ contrib/python-tx-tftp/tftp/bootstrap.py	2012-10-05 10:07:25 +0000
@@ -180,7 +180,7 @@
         @type datagram: L{ERRORDatagram}
 
         """
-        log.msg("Got error: " % datagram)
+        log.msg("Got error: %s" % datagram)
         return self.cancel()
 
     def cancel(self):

=== modified file 'contrib/python-tx-tftp/tftp/session.py'
--- contrib/python-tx-tftp/tftp/session.py	2012-07-03 12:11:41 +0000
+++ contrib/python-tx-tftp/tftp/session.py	2012-10-05 10:07:25 +0000
@@ -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):