Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1639986 - Add hack to bootstrap to install Python 2 on macOS r=firefox-build-system-reviewers,nalexander

Browse Source 
This is ugly and complicates the code some but it's manageable and allows us to keep things afloat on macOS while the testing team plugs along with the `mach` migration.

Differential Revision: https://phabricator.services.mozilla.com/D76386
This commit is contained in:
Ricky Stewart 2020-05-21 20:25:34 +00:00
parent 306ff5694d
commit 0a8ac76fef
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
python/mozboot/mozboot/osx.py
View File

@ -303,20 +303,30 @@ class OSXBootstrapper(BaseBootstrapper):
installed = set(self.check_output(cmd + ['list'],
universal_newlines=True).split())
to_install = [package for package in packages if package not in installed]
to_install = set(
package for package in packages if package not in installed)
# The "--quiet" tells "brew" to only list the package names, and not the
# comparison between current and new version.
outdated = set(self.check_output(cmd + ['outdated', '--quiet'],
universal_newlines=True).split())
to_upgrade = [package for package in packages if package in outdated]
to_upgrade = set(package for package in packages if package in outdated)
if to_install or to_upgrade:
print(PACKAGE_MANAGER_PACKAGES % ('Homebrew',))
if 'python@2' in to_install:
# Special handling for Python 2 since brew can't install it
# out-of-the-box any more.
to_install.remove('python@2')
subprocess.check_call(
cmd + ['install',
'https://raw.githubusercontent.com/Homebrew/homebrew-core'
'/86a44a0a552c673a05f11018459c9f5faae3becc'
'/Formula/python@2.rb'])
if to_install:
subprocess.check_call(cmd + ['install'] + to_install)
subprocess.check_call(cmd + ['install'] + list(to_install))
if to_upgrade:
subprocess.check_call(cmd + ['upgrade'] + to_upgrade)
subprocess.check_call(cmd + ['upgrade'] + list(to_upgrade))
def _ensure_homebrew_casks(self, casks):
self._ensure_homebrew_found()
@ -348,6 +358,7 @@ class OSXBootstrapper(BaseBootstrapper):
'gnu-tar',
'node',
'python',
'python@2',
'terminal-notifier',
'watchman',
]