From patchwork Fri Feb 3 03:29:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongqin Liu X-Patchwork-Id: 6586 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 1293A23E81 for ; Fri, 3 Feb 2012 03:29:14 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id BD703A1808C for ; Fri, 3 Feb 2012 03:29:13 +0000 (UTC) Received: by iabz7 with SMTP id z7so5630098iab.11 for ; Thu, 02 Feb 2012 19:29:13 -0800 (PST) Received: by 10.50.156.196 with SMTP id wg4mr6349858igb.13.1328239753023; Thu, 02 Feb 2012 19:29:13 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.169.210 with SMTP id a18cs1168ibz; Thu, 2 Feb 2012 19:29:12 -0800 (PST) Received: by 10.180.84.105 with SMTP id x9mr21881052wiy.19.1328239751178; Thu, 02 Feb 2012 19:29:11 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id fx6si3963500wib.29.2012.02.02.19.29.10 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 02 Feb 2012 19:29:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1Rt9pm-00031J-Jt for ; Fri, 03 Feb 2012 03:29:10 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 87442E0532 for ; Fri, 3 Feb 2012 03:29:10 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dispatcher X-Launchpad-Branch: ~linaro-validation/lava-dispatcher/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 217 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [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> Date: Fri, 03 Feb 2012 03:29:10 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14738"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 831a56029ac4d8074d8441854617b9bfcb4b1895 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 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 === 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")