diff mbox

[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
State Accepted
Headers show

Commit Message

Loïc Minier Jan. 22, 2011, 10:21 a.m. UTC 
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 <lool@dooz.org>
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
diff mbox

Patch

=== 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: