Merge last PGO-green changeset of mozilla-inbound to mozilla-central
authorPhil Ringnalda <philringnalda@gmail.com>
Sun, 07 Oct 2012 18:31:44 -0700
changeset 109581 e6df45a289022aef32c4249cd283f1d358958c15
parent 109580 386f6fb98537f1b90c9f0f571851126df79c3a93 (current diff)
parent 109571 729099167c99ddc85bb109e4a7f2872e4a0abc8a (diff)
child 109582 70337fa2fe62cfe01d7cb4b5addb2a36c4a554c8
push id23634
push userphilringnalda@gmail.com
push dateMon, 08 Oct 2012 01:32:21 +0000
treeherdermozilla-central@e6df45a28902 [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 last PGO-green changeset of mozilla-inbound to mozilla-central
--- 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}')