From patchwork Sat Jan 22 10:21:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Lo=C3=AFc_Minier?= X-Patchwork-Id: 17 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:39:15 -0000 Delivered-To: patches@linaro.org Received: by 10.147.124.10 with SMTP id b10cs159527yan; Sat, 22 Jan 2011 02:21:32 -0800 (PST) Received: by 10.216.90.79 with SMTP id d57mr338933wef.65.1295691692099; Sat, 22 Jan 2011 02:21:32 -0800 (PST) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id p3si16636595wer.193.2011.01.22.02.21.31; Sat, 22 Jan 2011 02:21:32 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1Pgab5-00012S-H1 for ; Sat, 22 Jan 2011 10:21:31 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 7F1052E8028 for ; Sat, 22 Jan 2011 10:21:31 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: linaro-image-tools X-Launchpad-Branch: ~linaro-maintainers/linaro-image-tools/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 253 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-maintainers/linaro-image-tools/trunk] Rev 253: Merge lp:~lool/linaro-image-tools/testsuite-env-fixes. Message-Id: <20110122102131.17921.93153.launchpad@loganberry.canonical.com> Date: Sat, 22 Jan 2011 10:21:31 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="12214"; Instance="initZopeless config overlay" X-Launchpad-Hash: 7b654d02616c40ee8b9e7642062fd431b70d6039 Merge authors: Loïc Minier (lool) Related merge proposals: https://code.launchpad.net/~lool/linaro-image-tools/testsuite-env-fixes/+merge/47131 proposed by: Loïc Minier (lool) review: Approve - James Westby (james-w) ------------------------------------------------------------ revno: 253 [merge] committer: Loïc Minier branch nick: linaro-image-tools timestamp: Sat 2011-01-22 11:18:54 +0100 message: Merge lp:~lool/linaro-image-tools/testsuite-env-fixes. modified: debian/rules hwpack/packages.py --- lp:linaro-image-tools https://code.launchpad.net/~linaro-maintainers/linaro-image-tools/trunk You are subscribed to branch lp:linaro-image-tools. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-maintainers/linaro-image-tools/trunk/+edit-subscription === modified file 'debian/rules' --- debian/rules 2011-01-19 18:30:16 +0000 +++ debian/rules 2011-01-22 00:20:14 +0000 @@ -6,4 +6,4 @@ override_dh_auto_test: # XXX: The test-suite currently fails on Lucid. What can we do about # it? - NO_PKG_MANGLE=1 python -m testtools.run tests.test_suite + python -m testtools.run tests.test_suite === modified file 'hwpack/packages.py' --- hwpack/packages.py 2010-12-16 23:18:05 +0000 +++ hwpack/packages.py 2011-01-22 10:17:26 +0000 @@ -221,8 +221,12 @@ with open(os.path.join( packaging_dir, 'DEBIAN', 'control'), 'w') as control_file: control_file.write(control_file_text) + env = os.environ + env['LC_ALL'] = 'C' + env['NO_PKG_MANGLE'] = '1' proc = subprocess.Popen( ['dpkg-deb', '-b', packaging_dir], + env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE) (stdoutdata, stderrdata) = proc.communicate() if proc.returncode: