Bug 1169089 - Detect CentOS 7 in bootstrapper; r=gps
authorTimur Timirkhanov <tim_tim2000@mail.ru>
Wed, 10 Jun 2015 11:27:15 -0700
changeset 248018 23d18852de14910d66042b384bdc85e3c9ff9f53
parent 248017 3d8d35663ab13322bf77f0b5c2345840d4934906
child 248019 e8683e11bbe62bdef03f378a5fec623601c51421
push id13473
push usergszorc@mozilla.com
push dateWed, 10 Jun 2015 18:28:00 +0000
treeherderfx-team@23d18852de14 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1169089
milestone41.0a1
Bug 1169089 - Detect CentOS 7 in bootstrapper; r=gps CentOS has apparently changed its disto name. Detect the new version. DONTBUILD (NPOTB)
python/mozboot/mozboot/bootstrap.py
--- a/python/mozboot/mozboot/bootstrap.py
+++ b/python/mozboot/mozboot/bootstrap.py
@@ -59,17 +59,17 @@ class Bootstrapper(object):
         self.finished = finished
         self.choice = choice
         cls = None
         args = {'no_interactive': no_interactive}
 
         if sys.platform.startswith('linux'):
             distro, version, dist_id = platform.linux_distribution()
 
-            if distro == 'CentOS':
+            if distro in ('CentOS', 'CentOS Linux'):
                 cls = CentOSBootstrapper
             elif distro in ('Debian', 'debian'):
                 cls = DebianBootstrapper
             elif distro == 'Fedora':
                 cls = FedoraBootstrapper
             elif distro == 'Gentoo Base System':
                 cls = GentooBootstrapper
             elif distro in ('Mint', 'LinuxMint'):