From 644eb4106b540e54d02ba018b879707cbb073e91 Mon Sep 17 00:00:00 2001
From: David Reid <dreid@dreid.org>
Date: Wed, 6 Nov 2013 11:13:42 -0800
Subject: Don't silence any failures.

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8350ebca..39fbc971 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,12 +28,12 @@ env:
 install:
     - "sudo add-apt-repository \"deb http://archive.ubuntu.com/ubuntu/ lucid main\""
     - sudo add-apt-repository -y ppa:pypy/ppa
-    - sudo apt-get -y update || true
-    - "[[ ${OPENSSL} == \"0.9.8\" ]] && sudo apt-get -y --force-yes install libssl-dev/lucid || true"
-    - "[[ ${TOX_ENV} == pypy ]] && sudo apt-get -y install pypy || true"
+    - sudo apt-get -y update
+    - "[[ ${OPENSSL} == \"0.9.8\" ]] && sudo apt-get -y --force-yes install libssl-dev/lucid"
+    - "[[ ${TOX_ENV} == pypy ]] && sudo apt-get -y install pypy"
     # This is required because we need to get rid of the Travis installed PyPy
     # or it'll take precedence over the PPA installed one.
-    - "[[ ${TOX_ENV} == pypy ]] && sudo rm -rf /usr/local/pypy/bin || true"
+    - "[[ ${TOX_ENV} == pypy ]] && sudo rm -rf /usr/local/pypy/bin"
     - pip install tox coveralls
 
 script:
-- 
cgit v1.2.3


From 6b609bbeb0223dcaa5da5f758d096dd4af4f81b4 Mon Sep 17 00:00:00 2001
From: David Reid <dreid@dreid.org>
Date: Wed, 6 Nov 2013 11:44:15 -0800
Subject: Use a script so you can write something resembling real code and
 reason about how it works.

---
 .travis.yml        | 10 +---------
 .travis/install.sh | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 9 deletions(-)
 create mode 100755 .travis/install.sh

diff --git a/.travis.yml b/.travis.yml
index 39fbc971..0a8771ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,15 +26,7 @@ env:
     - TOX_ENV=py3pep8
 
 install:
-    - "sudo add-apt-repository \"deb http://archive.ubuntu.com/ubuntu/ lucid main\""
-    - sudo add-apt-repository -y ppa:pypy/ppa
-    - sudo apt-get -y update
-    - "[[ ${OPENSSL} == \"0.9.8\" ]] && sudo apt-get -y --force-yes install libssl-dev/lucid"
-    - "[[ ${TOX_ENV} == pypy ]] && sudo apt-get -y install pypy"
-    # This is required because we need to get rid of the Travis installed PyPy
-    # or it'll take precedence over the PPA installed one.
-    - "[[ ${TOX_ENV} == pypy ]] && sudo rm -rf /usr/local/pypy/bin"
-    - pip install tox coveralls
+    - ./.travis/install.sh
 
 script:
     - tox -e $TOX_ENV
diff --git a/.travis/install.sh b/.travis/install.sh
new file mode 100755
index 00000000..94673084
--- /dev/null
+++ b/.travis/install.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -e
+set -x
+
+if [[ "${OPENSSL}" == "0.9.8" ]]; then
+    sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu/ lucid main"
+fi
+
+if [[ "${TOX_ENV}" == "pypy" ]]; then
+    sudo add-apt-repository -y ppa:pypy/ppa
+fi
+
+sudo apt-get -y update
+
+if [[ "${OPENSSL}" == "0.9.8" ]]; then
+    sudo apt-get install -y --force-yes libssl-dev/lucid
+fi
+
+if [[ "${TOX_ENV}" == "pypy"]]; then
+    sudo apt-get install -y pypy
+
+    # This is required because we need to get rid of the Travis installed PyPy
+    # or it'll take precedence over the PPA installed one.
+    sudo rm -rf /usr/local/pypy/bin
+fi
+
+pip install tox coverage
-- 
cgit v1.2.3


From 2752924d087cb03001574692052096d520d1302e Mon Sep 17 00:00:00 2001
From: David Reid <dreid@dreid.org>
Date: Wed, 6 Nov 2013 13:13:53 -0800
Subject: Fix stupid shell syntax error.

---
 .travis/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/install.sh b/.travis/install.sh
index 94673084..9c6d34c3 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -17,7 +17,7 @@ if [[ "${OPENSSL}" == "0.9.8" ]]; then
     sudo apt-get install -y --force-yes libssl-dev/lucid
 fi
 
-if [[ "${TOX_ENV}" == "pypy"]]; then
+if [[ "${TOX_ENV}" == "pypy" ]]; then
     sudo apt-get install -y pypy
 
     # This is required because we need to get rid of the Travis installed PyPy
-- 
cgit v1.2.3


From f0943938e7ded1e02dc3136772ec42b431c9d291 Mon Sep 17 00:00:00 2001
From: David Reid <dreid@dreid.org>
Date: Wed, 6 Nov 2013 13:47:36 -0800
Subject: Get the package name right.

---
 .travis/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/install.sh b/.travis/install.sh
index 9c6d34c3..fdd71907 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -25,4 +25,4 @@ if [[ "${TOX_ENV}" == "pypy" ]]; then
     sudo rm -rf /usr/local/pypy/bin
 fi
 
-pip install tox coverage
+pip install tox coveralls
-- 
cgit v1.2.3