aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Stufft <donald@stufft.io>2013-10-18 14:52:48 -0700
committerDonald Stufft <donald@stufft.io>2013-10-18 14:52:48 -0700
commita6cc54bdce87cf291903adce57211d9e890ad693 (patch)
tree5a4ba96d73caacd53a7ecacb60433ea8adcee6ac
parent487b71a10928f90e81a46a0d6f2dc24f5a01de84 (diff)
parent4f7093c23c425e27ddf940979109f9f63fb2a9f0 (diff)
downloadcryptography-a6cc54bdce87cf291903adce57211d9e890ad693.tar.gz
cryptography-a6cc54bdce87cf291903adce57211d9e890ad693.tar.bz2
cryptography-a6cc54bdce87cf291903adce57211d9e890ad693.zip
Merge pull request #117 from alex/mongodb-is-bad
Silence failures here because MongoDB's apt-repo broke stuff
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index defcd77b..6d164863 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ env:
install:
- "[[ ${TOX_ENV} == pypy ]] && sudo add-apt-repository -y ppa:pypy/ppa || true"
- - "[[ ${TOX_ENV} == pypy ]] && sudo apt-get -y update && sudo apt-get -y install pypy || true"
+ - "[[ ${TOX_ENV} == pypy ]] && (sudo apt-get -y update || true) && sudo apt-get -y install pypy || true"
# 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"