Backed out changeset b541ce3cbff5 (bug 1277087) for ab build failures
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 01 Jun 2016 09:19:06 +0200
changeset 340890 b6fe7fa88db0a4103d175bf5b02cd47c2c6722e6
parent 340889 bc2bd91854befe145331375bb36cb89dd3f9f3ba
child 340891 111970c738234569c8c180319155327316335deb
child 340923 61308d76e0121ee33b2732062b8ca31e7f0a3200
push id1183
push userraliiev@mozilla.com
push dateMon, 05 Sep 2016 20:01:49 +0000
treeherdermozilla-release@3148731bed45 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1277087
milestone49.0a1
backs outb541ce3cbff5099dca2901618f15cfc415396b5b
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
Backed out changeset b541ce3cbff5 (bug 1277087) for ab build failures
build/mach_bootstrap.py
--- a/build/mach_bootstrap.py
+++ b/build/mach_bootstrap.py
@@ -228,18 +228,21 @@ def bootstrap(topsrcdir, mozilla_dir=Non
     # Global build system and mach state is stored in a central directory. By
     # default, this is ~/.mozbuild. However, it can be defined via an
     # environment variable. We detect first run (by lack of this directory
     # existing) and notify the user that it will be created. The logic for
     # creation is much simpler for the "advanced" environment variable use
     # case. For default behavior, we educate users and give them an opportunity
     # to react. We always exit after creating the directory because users don't
     # like surprises.
-    sys.path[0:0] = [os.path.join(mozilla_dir, path) for path in SEARCH_PATHS]
-    import mach.main
+    try:
+        import mach.main
+    except ImportError:
+        sys.path[0:0] = [os.path.join(mozilla_dir, path) for path in SEARCH_PATHS]
+        import mach.main
 
     def telemetry_handler(context, data):
         # We have not opted-in to telemetry
         if 'BUILD_SYSTEM_TELEMETRY' not in os.environ:
             return
 
         telemetry_dir = os.path.join(get_state_dir()[0], 'telemetry')
         try: