diff mbox

[Branch,~linaro-validation/lava-scheduler/trunk] Rev 117: Merge lp:~mwhudson/lava-scheduler/binary-goop-in-job-file-bug-918954

Message ID 20120120115017.28138.1537.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Zygmunt Krynicki Jan. 20, 2012, 11:50 a.m. UTC 
Merge authors:
  Michael Hudson-Doyle (mwhudson)
Related merge proposals:
  https://code.launchpad.net/~mwhudson/lava-scheduler/binary-goop-in-job-file-bug-918954/+merge/89377
  proposed by: Michael Hudson-Doyle (mwhudson)
  review: Approve - Zygmunt Krynicki (zkrynicki)
------------------------------------------------------------
revno: 117 [merge]
committer: Zygmunt Krynicki <zygmunt.krynicki@linaro.org>
branch nick: trunk
timestamp: Fri 2012-01-20 12:47:31 +0100
message:
  Merge lp:~mwhudson/lava-scheduler/binary-goop-in-job-file-bug-918954
modified:
  lava_scheduler_app/logfile_helper.py


--
lp:lava-scheduler
https://code.launchpad.net/~linaro-validation/lava-scheduler/trunk

You are subscribed to branch lp:lava-scheduler.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-scheduler/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'lava_scheduler_app/logfile_helper.py'
--- lava_scheduler_app/logfile_helper.py	2012-01-11 22:09:33 +0000
+++ lava_scheduler_app/logfile_helper.py	2012-01-20 04:20:04 +0000
@@ -52,6 +52,7 @@ 
 
     for line in logfile:
         line = line.replace('\r', '')
+        line = unicode(line, 'ascii', 'replace')
         if not line:
             continue
         if line == 'Traceback (most recent call last):\n':