From patchwork Fri Jan 20 11:50:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 6315 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 A062E23E16 for ; Fri, 20 Jan 2012 11:50:21 +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 84C8EA18961 for ; Fri, 20 Jan 2012 11:50:21 +0000 (UTC) Received: by bkar19 with SMTP id r19so341913bka.11 for ; Fri, 20 Jan 2012 03:50:21 -0800 (PST) Received: by 10.205.26.67 with SMTP id rl3mr11817684bkb.45.1327060219468; Fri, 20 Jan 2012 03:50:19 -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.205.82.144 with SMTP id ac16cs3712bkc; Fri, 20 Jan 2012 03:50:19 -0800 (PST) Received: by 10.180.94.97 with SMTP id db1mr51317903wib.16.1327060217644; Fri, 20 Jan 2012 03:50:17 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id f5si2124664wed.94.2012.01.20.03.50.17 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 20 Jan 2012 03:50:17 -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 1RoCz3-0008Ge-DZ for ; Fri, 20 Jan 2012 11:50:17 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 5DB7EE0539 for ; Fri, 20 Jan 2012 11:50:17 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-scheduler X-Launchpad-Branch: ~linaro-validation/lava-scheduler/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 117 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [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> Date: Fri, 20 Jan 2012 11:50:17 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14700"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 4a1a6afec4a966576077903e17e3b0cf1377a2fe 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 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 === 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':