Bug 1401718: adapt to xcode's new non-ascii license error r=gps
authorPhilip Jenvey <pjenvey@underboss.org>
Fri, 22 Sep 2017 14:58:28 -0700
changeset 382558 5870f25b4a83
parent 382557 2b59b2d150ce
child 382559 fd4b9c72b832
push id51909
push usergszorc@mozilla.com
push dateFri, 22 Sep 2017 23:01:34 +0000
treeherderautoland@5870f25b4a83 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1401718
milestone58.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
Bug 1401718: adapt to xcode's new non-ascii license error r=gps avoid unicode conversion (since unicode_literals is in use) MozReview-Commit-ID: AfgzAWsjRp
python/mozbuild/mozbuild/base.py
--- a/python/mozbuild/mozbuild/base.py
+++ b/python/mozbuild/mozbuild/base.py
@@ -668,17 +668,17 @@ class MozbuildObject(ProcessExecutionMix
             params['log_name'] = 'make'
 
         return fn(**params)
 
     def _make_path(self):
         baseconfig = os.path.join(self.topsrcdir, 'config', 'baseconfig.mk')
 
         def is_xcode_lisense_error(output):
-            return self._is_osx() and 'Agreeing to the Xcode' in output
+            return self._is_osx() and b'Agreeing to the Xcode' in output
 
         def validate_make(make):
             if os.path.exists(baseconfig) and os.path.exists(make):
                 cmd = [make, '-f', baseconfig]
                 if self._is_windows():
                     cmd.append('HOST_OS_ARCH=WINNT')
                 try:
                     subprocess.check_output(cmd, stderr=subprocess.STDOUT)