From 41fbdd3018127395fe18b9e9e7ce4c6a86d7aed8 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Wed, 15 Oct 2014 10:52:10 -0700
Subject: upgrade openssl to 1.0.1j on travis

---
 .travis/install.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to '.travis')

diff --git a/.travis/install.sh b/.travis/install.sh
index 0c64ba93..01affab4 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -10,16 +10,16 @@ else
 fi
 
 if [[ "${OPENSSL}" == "0.9.8" ]]; then
-    if [[ "$DARWIN" = true ]]; then
-        # travis has openssl installed via brew already, but let's be sure
-        if [[ "$(brew list | grep openssl)" != "openssl" ]]; then
-            brew install openssl
-        fi
-    else
+    if [[ "$DARWIN" = false ]]; then
         sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu/ lucid main"
         sudo apt-get -y update
         sudo apt-get install -y --force-yes libssl-dev/lucid
     fi
+else
+    if [[ "$DARWIN" = true ]]; then
+        brew update
+        brew upgrade openssl
+    fi
 fi
 
 if [[ "${TOX_ENV}" == "docs" ]]; then
-- 
cgit v1.2.3