From f69622f041172818c7ca7d1f3d8822934837874e Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Wed, 11 Feb 2015 21:18:35 +1100
Subject: [PATCH] Travis: cope with setuptools upgrade failing

---
 Tools/scripts/install-travis-env.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Tools/scripts/install-travis-env.sh b/Tools/scripts/install-travis-env.sh
index e8e8520e6d..f389ef9b04 100755
--- a/Tools/scripts/install-travis-env.sh
+++ b/Tools/scripts/install-travis-env.sh
@@ -29,7 +29,9 @@ APT_GET="sudo apt-get -qq --assume-yes"
 
 $APT_GET update
 $APT_GET install $BASE_PKGS $SITL_PKGS $PX4_PKGS $UBUNTU64_PKGS $AVR_PKGS
-pip install --upgrade setuptools
+pip install --upgrade setuptools || {
+    echo "setuptools upgrade failed"
+}
 for pkg in $PYTHON_PKGS; do
     echo "Installing $pkg"
     pip -q install $pkg || echo "FAILED INSTALL OF $pkg"