Merge lp:~jtv/maas/bug-1062031 into lp:maas/trunk

Proposed by Jeroen T. Vermeulen on 2012-10-05
Status: Merged
Approved by: John A Meinel on 2012-10-05
Approved revision: 1186
Merged at revision: 1192
Proposed branch: lp:~jtv/maas/bug-1062031
Merge into: lp:maas/trunk
Diff against target: 34 lines (+3/-3)
2 files modified
contrib/python-tx-tftp/tftp/bootstrap.py (+1/-1)
contrib/python-tx-tftp/tftp/session.py (+2/-2)
To merge this branch: bzr merge lp:~jtv/maas/bug-1062031
Reviewer Review Type Date Requested Status
Gavin Panella (community) 2012-10-05 Approve on 2012-10-05
Review via email: mp+128205@code.launchpad.net

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

Description of the change

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

To post a comment you must log in.
Gavin Panella (allenap) :
review: Approve
MAAS Lander (maas-lander) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/maas-merger-quantal/124/console reported an error when processing this lp:~jtv/maas/bug-1062031 branch.
Not merging it.

MAAS Lander (maas-lander) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/maas-merger-quantal/125/console reported an error when processing this lp:~jtv/maas/bug-1062031 branch.
Not merging it.

MAAS Lander (maas-lander) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/maas-merger-quantal/126/console reported an error when processing this lp:~jtv/maas/bug-1062031 branch.
Not merging it.

MAAS Lander (maas-lander) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/maas-merger-quantal/130/console reported an error when processing this lp:~jtv/maas/bug-1062031 branch.
Not merging it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'contrib/python-tx-tftp/tftp/bootstrap.py'
2--- contrib/python-tx-tftp/tftp/bootstrap.py 2012-08-22 11:00:12 +0000
3+++ contrib/python-tx-tftp/tftp/bootstrap.py 2012-10-05 15:14:23 +0000
4@@ -180,7 +180,7 @@
5 @type datagram: L{ERRORDatagram}
6
7 """
8- log.msg("Got error: " % datagram)
9+ log.msg("Got error: %s" % datagram)
10 return self.cancel()
11
12 def cancel(self):
13
14=== modified file 'contrib/python-tx-tftp/tftp/session.py'
15--- contrib/python-tx-tftp/tftp/session.py 2012-07-03 12:11:41 +0000
16+++ contrib/python-tx-tftp/tftp/session.py 2012-10-05 15:14:23 +0000
17@@ -69,7 +69,7 @@
18 if datagram.opcode == OP_DATA:
19 return self.tftp_DATA(datagram)
20 elif datagram.opcode == OP_ERROR:
21- log.msg("Got error: " % datagram)
22+ log.msg("Got error: %s" % datagram)
23 self.cancel()
24
25 def tftp_DATA(self, datagram):
26@@ -211,7 +211,7 @@
27 if datagram.opcode == OP_ACK:
28 return self.tftp_ACK(datagram)
29 elif datagram.opcode == OP_ERROR:
30- log.msg("Got error: " % datagram)
31+ log.msg("Got error: %s" % datagram)
32 self.cancel()
33
34 def tftp_ACK(self, datagram):