From 947f81e1c892a34c3cd72f1b0ee585cbbf1c119d Mon Sep 17 00:00:00 2001 From: Andrew Halberstadt Date: Fri, 15 Nov 2013 09:59:26 -0500 Subject: [PATCH] Bug 939024 - Fix unicode env problem in mach_b2g_bootstrap.py, r=jgriffin --- tools/mach_b2g_bootstrap.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/mach_b2g_bootstrap.py b/tools/mach_b2g_bootstrap.py index 6ba0b48d..2d41cf9b 100644 --- a/tools/mach_b2g_bootstrap.py +++ b/tools/mach_b2g_bootstrap.py @@ -171,9 +171,9 @@ def bootstrap(b2g_home): % os.path.join(b2g_home, 'load-config.sh')] try: output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, cwd=b2g_home) - for line in output.splitlines(): + for line in [l.decode('utf8') for l in output.splitlines()]: key, value = line.split('=', 1) - os.environ[key] = value + os.environ[key.encode('utf8')] = value.encode('utf8') except subprocess.CalledProcessError, e: print(LOAD_CONFIG_FAILED % e.output.strip()) sys.exit(1)