From patchwork Mon Jan 30 17:57:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Larson X-Patchwork-Id: 6445 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 F2457249C6 for ; Mon, 30 Jan 2012 17:57:14 +0000 (UTC) Received: from mail-bk0-f52.google.com (mail-bk0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id E23F0A18161 for ; Mon, 30 Jan 2012 17:57:14 +0000 (UTC) Received: by mail-bk0-f52.google.com with SMTP id r19so4568550bka.11 for ; Mon, 30 Jan 2012 09:57:14 -0800 (PST) Received: by 10.204.10.82 with SMTP id o18mr9303983bko.20.1327946234709; Mon, 30 Jan 2012 09:57:14 -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.204.130.220 with SMTP id u28cs159765bks; Mon, 30 Jan 2012 09:57:14 -0800 (PST) Received: by 10.180.101.35 with SMTP id fd3mr28870930wib.22.1327946234161; Mon, 30 Jan 2012 09:57:14 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id v65si13191230weq.20.2012.01.30.09.57.14 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 30 Jan 2012 09:57:14 -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 1RrvTd-0004FR-VZ for ; Mon, 30 Jan 2012 17:57:13 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id E510AE0442 for ; Mon, 30 Jan 2012 17:57:13 +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: 210 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 210: Fix problem when reporting failure messages that contain unicode Message-Id: <20120130175713.11573.50586.launchpad@ackee.canonical.com> Date: Mon, 30 Jan 2012 17:57:13 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14727"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 808140e89214b69976a87a92e01360f4619a142c Merge authors: Michael Hudson-Doyle (mwhudson) Related merge proposals: https://code.launchpad.net/~mwhudson/lava-dispatcher/unicode-error-in-error-reporting/+merge/90369 proposed by: Michael Hudson-Doyle (mwhudson) review: Approve - Zygmunt Krynicki (zkrynicki) ------------------------------------------------------------ revno: 210 [merge] committer: Paul Larson branch nick: lava-dispatcher timestamp: Mon 2012-01-30 11:51:11 -0600 message: Fix problem when reporting failure messages that contain unicode modified: doc/changes.rst 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 'doc/changes.rst' --- doc/changes.rst 2012-01-27 03:34:40 +0000 +++ doc/changes.rst 2012-01-30 17:51:11 +0000 @@ -1,6 +1,13 @@ Version History *************** +.. _version_0_5_0: + +Version 0.5.0 +================================ +* Add new android_install_binaries action +* Fix problem when reporting failure messages that contain unicode + .. _version_0_4_5: Version 0.4.5 === modified file 'lava_dispatcher/job.py' --- lava_dispatcher/job.py 2011-11-30 02:31:12 +0000 +++ lava_dispatcher/job.py 2012-01-27 04:17:56 +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'], err) + (cmd['command'], unicode(err, 'ascii', 'replace')) if cmd['command'] == 'lava_test_run': err_msg += "Lava failed on test: %s" %\ params.get('test_name', "Unknown")