Bug 1640064: Don't attempt to install python-pip (py2) on Debian Sid r=rstewart
authorMitchell Hentges <mhentges@mozilla.com>
Fri, 29 May 2020 20:17:40 +0000
changeset 533052 df8bd16c2935394df0cc53b9f15dad330a72343d
parent 533051 2050484c1868668644ad4801eac2990dd7556342
child 533053 89c202fdb156926eef9e8379b0ab116437b48891
push id37462
push usermalexandru@mozilla.com
push dateSat, 30 May 2020 09:46:43 +0000
treeherdermozilla-central@8aaca63ec5c6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrstewart
bugs1640064
milestone78.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 1640064: Don't attempt to install python-pip (py2) on Debian Sid r=rstewart Differential Revision: https://phabricator.services.mozilla.com/D77517
python/mozboot/mozboot/debian.py
--- a/python/mozboot/mozboot/debian.py
+++ b/python/mozboot/mozboot/debian.py
@@ -91,17 +91,17 @@ class DebianBootstrapper(
         if self.distro == 'debian':
             self.packages += self.DEBIAN_PACKAGES
         # Due to the Python 2 EOL, newer versions of Ubuntu don't carry the
         # same Python packages as older ones.
         if self.distro == 'ubuntu' and int(self.version.split('.')[0]) >= 20:
             self.packages.extend(['python2.7', 'python2.7-dev'])
         else:
             if (self.distro == 'ubuntu'
-                or (self.distro == 'debian' and self.codename != "bullseye")):
+                or (self.distro == 'debian' and self.codename not in ('bullseye', 'sid',))):
                 # On old Ubuntu and Debian before bullseye (11), it was called this way
                 # Note that we don't use Debian version code as the Python API doesn't provide
                 # it yet
                 # TODO: Update once bullseye is released in 2021
                 self.packages.append('python-pip')
 
             self.packages.append('python-dev')
         self.browser_packages = self.BROWSER_COMMON_PACKAGES + self.BROWSER_DISTRO_PACKAGES