Merge m-c to inbound.
authorRyan VanderMeulen <ryanvm@gmail.com>
Sun, 07 Oct 2012 20:56:07 -0400
changeset 109587 cf1bb42b3420f2c81392b8404ec89695c58cc8f3
parent 109586 959de7eea1ff4082cd79b69ab2fef4f73f65c175 (current diff)
parent 109571 729099167c99ddc85bb109e4a7f2872e4a0abc8a (diff)
child 109588 71c76fb26e9efb904a68062ec295fcf9ae65cd0e
push id23636
push usergsharp@mozilla.com
push dateMon, 08 Oct 2012 08:08:19 +0000
treeherdermozilla-central@24cf40690042 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone18.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge m-c to inbound.
--- a/python/mozbuild/mozbuild/base.py
+++ b/python/mozbuild/mozbuild/base.py
@@ -309,17 +309,17 @@ class MozbuildObject(object):
         """
         args = self._normalize_command(args, require_unix_environment)
 
         self.log(logging.INFO, 'process', {'args': args}, ' '.join(args))
 
         def handleLine(line):
             # Converts str to unicode on Python 2 and bytes to str on Python 3.
             if isinstance(line, bytes):
-                line = line.decode(sys.stdout.encoding)
+                line = line.decode(sys.stdout.encoding or 'utf-8', 'replace')
 
             if line_handler:
                 line_handler(line)
 
             if not log_name:
                 return
 
             self.log(log_level, log_name, {'line': line.strip()}, '{line}')