Bug 1368655 - only download Stylo packages if the user wanted Stylo; r=rillian
authorNathan Froyd <froydnj@mozilla.com>
Thu, 01 Jun 2017 19:15:03 -0400
changeset 410097 a9f2f087d8242123e8d3f44d64e3f68d910903bb
parent 410096 63cd7aaf05d865a5ffc030a3c336b4cec40f45f2
child 410098 71669172faf131b0035297f09f82876a50deac73
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrillian
bugs1368655
milestone55.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 1368655 - only download Stylo packages if the user wanted Stylo; r=rillian DONTBUILD because NPOTB
python/mozboot/mozboot/bootstrap.py
--- a/python/mozboot/mozboot/bootstrap.py
+++ b/python/mozboot/mozboot/bootstrap.py
@@ -330,19 +330,20 @@ class Bootstrapper(object):
             if wants_stylo and not state_dir_available:
                 print(STYLO_DIRECTORY_MESSAGE.format(statedir=state_dir))
                 sys.exit(1)
 
             if wants_stylo and not have_clone:
                 print(STYLO_REQUIRES_CLONE)
                 sys.exit(1)
 
-            self.instance.stylo = True
-            self.instance.state_dir = state_dir
-            self.instance.ensure_stylo_packages(state_dir, checkout_root)
+            self.instance.stylo = wants_stylo
+            if wants_stylo:
+                self.instance.state_dir = state_dir
+                self.instance.ensure_stylo_packages(state_dir, checkout_root)
 
         print(self.finished % name)
         if not (self.instance.which('rustc') and self.instance._parse_version('rustc') >= MODERN_RUST_VERSION):
             print("To build %s, please restart the shell (Start a new terminal window)" % name)
 
         # Like 'suggest_browser_mozconfig' or 'suggest_mobile_android_mozconfig'.
         getattr(self.instance, 'suggest_%s_mozconfig' % application)()