diff mbox

[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 217: merge with the branch that fix to call unicode on error instance

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

Commit Message

Yongqin Liu Feb. 3, 2012, 3:29 a.m. UTC 
Merge authors:
  Yongqin Liu (liuyq0307)
Related merge proposals:
  https://code.launchpad.net/~liuyq0307/lava-dispatcher/fix-925396/+merge/91235
  proposed by: Yongqin Liu (liuyq0307)
  review: Approve - Zygmunt Krynicki (zkrynicki)
------------------------------------------------------------
revno: 217 [merge]
committer: Yongqin Liu <yongqin.liu@linaro.org>
branch nick: lava-dispatcher
timestamp: Fri 2012-02-03 11:26:50 +0800
message:
  merge with the branch that fix to call  unicode on error instance
modified:
  lava_dispatcher/job.py


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

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

Patch

=== modified file 'lava_dispatcher/job.py'
--- lava_dispatcher/job.py	2012-01-27 04:17:56 +0000
+++ lava_dispatcher/job.py	2012-02-02 11:01:31 +0000
@@ -138,7 +138,7 @@ 
                     logging.info("Action %s finished." % cmd['command'])
                     if status == 'fail':
                         err_msg = "Lava failed at action %s with error: %s\n" %\
-                                  (cmd['command'], unicode(err, 'ascii', 'replace'))
+                                  (cmd['command'], unicode(str(err), 'ascii', 'replace'))
                         if cmd['command'] == 'lava_test_run':
                             err_msg += "Lava failed on test: %s" %\
                                        params.get('test_name', "Unknown")