Bug 1275437 - Bootstrapper now recognizes msys version of Python. r?gps draft
authorNathan Hakkakzadeh <nhakkakzadeh@mozilla.com>
Wed, 25 May 2016 14:01:27 -0700
changeset 371037 158767fbb4532fc8796091c78bfcd0801df7a1a2
parent 371034 b77a2b40ec306c2f14633392cdc3f46771b0bb6f
child 371040 fa66d8425103397ad8eabf2c6c14dfc14c51e445
child 371041 7271850ed9c997fa247a750a679d0a346afbf799
push id19213
push userbmo:nhakkakzadeh@mozilla.com
push dateWed, 25 May 2016 21:02:08 +0000
reviewersgps
bugs1275437
milestone49.0a1
Bug 1275437 - Bootstrapper now recognizes msys version of Python. r?gps Before, the bootstrapper would only know it was being run on Windows if it was run with the official Windows version of Python or the mingw version of Python. MozReview-Commit-ID: JK5Q4ERBdWs
python/mozboot/mozboot/bootstrap.py
--- a/python/mozboot/mozboot/bootstrap.py
+++ b/python/mozboot/mozboot/bootstrap.py
@@ -135,20 +135,19 @@ class Bootstrapper(object):
             args['version'] = platform.uname()[2]
 
         elif sys.platform.startswith('dragonfly') or \
                 sys.platform.startswith('freebsd'):
             cls = FreeBSDBootstrapper
             args['version'] = platform.release()
             args['flavor'] = platform.system()
 
-        elif sys.platform.startswith('win32'):
-            # TODO: Check to see if platform is actually msys2 or not.
+        elif sys.platform.startswith('win32') or sys.platform.starswith('msys'):
             cls = WindowsBootstrapper
-
+        
         if cls is None:
             raise NotImplementedError('Bootstrap support is not yet available '
                                       'for your OS.')
 
         self.instance = cls(**args)
 
     def bootstrap(self):
         if self.choice is None: