Merge lp:~tsarev/percona-server/rnt-5.1_fix_bug_911237 into lp:percona-server/rnt-5.1

Proposed by Oleg Tsarev
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 207
Proposed branch: lp:~tsarev/percona-server/rnt-5.1_fix_bug_911237
Merge into: lp:percona-server/rnt-5.1
Diff against target: 12 lines (+1/-1)
1 file modified
patches/subunit.patch (+1/-1)
To merge this branch: bzr merge lp:~tsarev/percona-server/rnt-5.1_fix_bug_911237
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
Review via email: mp+87356@code.launchpad.net

Description of the change

Fix incorrect month output from Subunit.pm
Perl localtime return month in range 0..11, subunit2junitxml expect range 1..12

To post a comment you must log in.
Revision history for this message
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'patches/subunit.patch'
2--- patches/subunit.patch 2011-10-06 09:42:44 +0000
3+++ patches/subunit.patch 2012-01-03 14:02:26 +0000
4@@ -88,7 +88,7 @@
5 + my ($time) = @_;
6 + my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = localtime($time);
7 + open(SUBUNITOUT, ">>$SUBUNIT_OUT");
8-+ printf SUBUNITOUT "time: %04d-%02d-%02d %02d:%02d:%02dZ\n", $year+1900, $mon, $mday, $hour, $min, $sec;
9++ printf SUBUNITOUT "time: %04d-%02d-%02d %02d:%02d:%02dZ\n", $year+1900, ($mon+1), $mday, $hour, $min, $sec;
10 + close(SUBUNITOUT);
11 + return;
12 +}

Subscribers

People subscribed via source and target branches