From 844bb38326d81c429d470aa2efb9ab4acf1887c1 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Sun, 11 Mar 2018 14:34:33 -0400
Subject: [PATCH] Accommodate homebrew changes in salt-from-scratch builds.

---
 .travis/dispatch.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.travis/dispatch.sh b/.travis/dispatch.sh
index 374c8f10..6d7831c8 100755
--- a/.travis/dispatch.sh
+++ b/.travis/dispatch.sh
@@ -69,10 +69,6 @@ setup_test_venv() {
     fi
     travis_fold_start 'test_venv.install_python3' \
         'Setting up Python 3 virtualenv for testing'
-    if [[ "${SALT_NODE_ID}" =~ servo-mac.* ]]; then
-        brew update
-        brew upgrade python
-    fi
     # Use the system Python 3 to make it easy to run tests on fresh hosts
     # Make sure dependencies are installed (like `python3-venv` on Debian derivatives)
     salt_call --retcode-passthrough state.sls python
@@ -99,6 +95,11 @@ if (( EUID != 0 )); then
     SUDO="sudo"
 fi
 
+# Accommodate homebrew changes to python 2/3 formulas.
+if [[ "${SALT_NODE_ID}" =~ servo-mac.* ]]; then
+    brew update
+    brew upgrade python
+fi
 
 if [[ "${SALT_NODE_ID}" == "test" ]]; then
     # Run test suite separately for parallelism