Bug 1277087 - Always add in-tree search paths when bootstrapping mach. r=gps
--- a/build/mach_bootstrap.py
+++ b/build/mach_bootstrap.py
@@ -228,21 +228,18 @@ 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.
- try:
- import mach.main
- except ImportError:
- sys.path[0:0] = [os.path.join(mozilla_dir, path) for path in SEARCH_PATHS]
- import mach.main
+ 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: