1 files changed, 6 insertions, 13 deletions
diff --git a/testsuite/install.sh b/testsuite/install.sh
index 1ca89f40f..9de5b8c6d 100755
--- a/testsuite/install.sh
+++ b/testsuite/install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -ex
 
 # install script for Travis-CI
 
@@ -7,20 +7,13 @@ pip install -r testsuite/requirements.txt --use-mirrors
 PYVER=$(python -c 'import sys;print(".".join(str(v) for v in sys.version_info[0:2]))')
 
 if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then
-    pip install --use-mirrors genshi PyYAML pyinotify
-    if [[ $PYVER == "2.5" ]]; then
-        # markdown 2.2+ doesn't work on py2.5
-        pip install --use-mirrors simplejson 'markdown<2.2'
-    fi
+    pip install --use-mirrors genshi PyYAML pyinotify boto 'django<1.5' \
+        pylibacl
+    easy_install https://fedorahosted.org/released/python-augeas/python-augeas-0.4.1.tar.gz
     if [[ ${PYVER:0:1} == "2" ]]; then
         # django supports py3k, but South doesn't, and the django bits
         # in bcfg2 require South
-        pip install cheetah 'django<1.5' 'South<0.8' M2Crypto
-    fi
-else
-    # python < 2.6 requires M2Crypto for SSL communication, not just
-    # for encryption support
-    if [[ $PYVER == "2.5" || $PYVER == "2.4" ]]; then
-        pip install --use-mirrors M2crypto
+        pip install cheetah 'South<0.8'
+        pip install m2crypto
     fi
 fi