Bug 918050 - mach bootstrap should do the same thing for Linux Mint that it does for Ubuntu. r=gps

python/mozboot/bin/bootstrap.py

@@ -39,7 +39,6 @@ REPOSITORY_PATHS = [
     'mozboot/fedora.py',
     'mozboot/freebsd.py',
     'mozboot/gentoo.py',
-    'mozboot/mint.py',
     'mozboot/openbsd.py',
     'mozboot/osx.py',
     'mozboot/ubuntu.py',

python/mozboot/mozboot/bootstrap.py

@@ -13,7 +13,6 @@ from mozboot.debian import DebianBootstrapper
 from mozboot.fedora import FedoraBootstrapper
 from mozboot.freebsd import FreeBSDBootstrapper
 from mozboot.gentoo import GentooBootstrapper
-from mozboot.mint import MintBootstrapper
 from mozboot.osx import OSXBootstrapper
 from mozboot.openbsd import OpenBSDBootstrapper
 from mozboot.ubuntu import UbuntuBootstrapper
@@ -50,7 +49,12 @@ class Bootstrapper(object):
             elif distro == 'Gentoo Base System':
                 cls = GentooBootstrapper
             elif distro in ('Mint', 'LinuxMint'):
-                cls = MintBootstrapper
+                # Most Linux Mint editions are based on Ubuntu; one is based on
+                # Debian, and reports this in dist_id
+                if dist_id == 'debian':
+                    cls = DebianBootstrapper
+                else:
+                    cls = UbuntuBootstrapper
             elif distro == 'Ubuntu':
                 cls = UbuntuBootstrapper
             elif distro == 'Elementary':

python/mozboot/mozboot/mint.py

@@ -1,34 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-import os
-
-from mozboot.base import BaseBootstrapper
-
-class MintBootstrapper(BaseBootstrapper):
-    def __init__(self, version, dist_id):
-        BaseBootstrapper.__init__(self)
-
-        self.version = version
-        self.dist_id = dist_id
-
-    def install_system_packages(self):
-        self.run_as_root(['apt-get', 'build-dep', 'firefox'])
-
-        self.apt_install(
-            'autoconf2.13',
-            'mercurial',
-            'libasound2-dev',
-            'libcurl4-openssl-dev',
-            'libgstreamer0.10-dev',
-            'libgstreamer-plugins-base0.10-dev',
-            'libnotify-dev',
-            'libiw-dev',
-            'libxt-dev',
-            'mesa-common-dev',
-            'uuid',
-            'yasm')
-
-    def upgrade_mercurial(self, current):
-        self.apt_install('mercurial')