Bug 1547730 - Add six to path when running configure. r=#build
☠☠ backed out by ee4b88439111 ☠ ☠
authorJustin Wood <Callek@gmail.com>
Tue, 30 Apr 2019 14:04:45 -0400
changeset 474134 b4e024474194a21d9ade565abfd8340e93aed07c
parent 474133 5f3c10562df335827c80fd866a1eba8f256540d2
child 474135 afa5801534e48eda70abc9080cf67217210a1d25
push id36023
push userncsoregi@mozilla.com
push dateThu, 16 May 2019 21:56:43 +0000
treeherdermozilla-central@786f094a30ae [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1547730
milestone68.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 1547730 - Add six to path when running configure. r=#build This is necessary for any attempt at @import('six') or doing any similar py2+py3 work in the configure sandbox. Differential Revision: https://phabricator.services.mozilla.com/D29604
configure.py
--- a/configure.py
+++ b/configure.py
@@ -9,16 +9,17 @@ import itertools
 import logging
 import os
 import sys
 import textwrap
 
 
 base_dir = os.path.abspath(os.path.dirname(__file__))
 sys.path.insert(0, os.path.join(base_dir, 'python', 'mozbuild'))
+sys.path.insert(0, os.path.join(base_dir, 'third_party', 'python', 'six'))
 from mozbuild.configure import (
     ConfigureSandbox,
     TRACE,
 )
 from mozbuild.pythonutil import iter_modules_in_path
 from mozbuild.backend.configenvironment import PartialConfigEnvironment
 from mozbuild.util import (
     indented_repr,