Merge lp://staging/~javier.collado/checkbox/bug393894 into lp://staging/checkbox

Proposed by Javier Collado
Status: Merged
Approved by: Marc Tardif
Approved revision: 604
Merged at revision: not available
Proposed branch: lp://staging/~javier.collado/checkbox/bug393894
Merge into: lp://staging/checkbox
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~javier.collado/checkbox/bug393894
Reviewer Review Type Date Requested Status
Marc Tardif (community) Approve
Review via email: mp+10927@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Javier Collado (javier.collado) wrote :

Hello,

I've made a small change that solves bug393894 at least in the cases that were causing a problem for me. Please review it and let me know if it's ok to merge into trunk. Thanks.

Best regards,
    Javier

Revision history for this message
Marc Tardif (cr3) wrote :

Nice workaround!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'checkbox/job.py'
2--- checkbox/job.py 2009-07-23 20:14:55 +0000
3+++ checkbox/job.py 2009-08-31 15:27:30 +0000
4@@ -81,7 +81,8 @@
5 self.data = _("Command not found.")
6 else:
7 self.status = FAIL
8- self.data = process.errdata
9+ self.data = (process.errdata
10+ or process.outdata)
11 elif os.WIFSIGNALED(status):
12 self.status = UNRESOLVED
13 term_signal = os.WTERMSIG(status)

Subscribers

People subscribed via source and target branches