# HG changeset patch
# User Rob Wu <rob@robwu.nl>
# Date 1555612771 0
#      Thu Apr 18 18:39:31 2019 +0000
# Node ID 74dc09642c222e18634f4f13e7b0bd6b7f91cbc2
# Parent  818371a9ab702e2e7320c5c62cc1dff8f5534c0c
Bug 1544981 - Stop tapping caskroom/versions in bootstrap for macOS r=nalexander

`caskroom/versions` was replaced with `homebrew/cask-versions` in 2018.
Tap `caskroom/versions` instead of the old one.

If you have two taps, remove the old one using:

    brew untap caskroom/versions

Differential Revision: https://phabricator.services.mozilla.com/D27839

diff --git a/python/mozboot/mozboot/osx.py b/python/mozboot/mozboot/osx.py
--- a/python/mozboot/mozboot/osx.py
+++ b/python/mozboot/mozboot/osx.py
@@ -316,17 +316,17 @@ class OSXBootstrapper(BaseBootstrapper):
 
         return printed
 
     def _ensure_homebrew_casks(self, casks):
         self._ensure_homebrew_found()
 
         # Ensure that we can access old versions of packages.  This is
         # idempotent, so no need to avoid repeat invocation.
-        self.check_output([self.brew, 'tap', 'caskroom/versions'])
+        self.check_output([self.brew, 'tap', 'homebrew/cask-versions'])
 
         # Change |brew install cask| into |brew cask install cask|.
         return self._ensure_homebrew_packages(casks, extra_brew_args=['cask'])
 
     def ensure_homebrew_system_packages(self):
         # We need to install Python because Mercurial requires the
         # Python development headers which are missing from OS X (at
         # least on 10.8) and because the build system wants a version
@@ -383,17 +383,17 @@ class OSXBootstrapper(BaseBootstrapper):
         self.ensure_java()
         from mozboot import android
 
         android.ensure_android('macosx', artifact_mode=artifact_mode,
                                no_interactive=self.no_interactive)
 
     def suggest_homebrew_mobile_android_mozconfig(self, artifact_mode=False):
         from mozboot import android
-        # Path to java from the caskroom/versions/java8 cask.
+        # Path to java from the homebrew/cask-versions/java8 cask.
         android.suggest_mozconfig('macosx', artifact_mode=artifact_mode,
                                   java_bin_path='/Library/Java/Home/bin')
 
     def _ensure_macports_packages(self, packages):
         self.port = self.which('port')
         assert self.port is not None
 
         installed = set(self.check_output([self.port, 'installed']).split())