From 70261c2ee5a42f5b7361888f629638cd04b9af2f Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Tue, 11 Feb 2014 20:16:25 +0100
Subject: [PATCH] Try to export the virtualenv deactivate function as we want
 to deactivate it for Jython builds

---
 .travis.yml                 | 1 +
 ci/before_install_jython.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index f7522df..5d0e399 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,7 @@ matrix:
       env: JYTHON=jython-installer:2.5.3 BACKEND=hsqldb
 
 before_install:
+  - export -f deactivate
   - ci/before_install.sh
   - source ~/myvirtualenv/bin/activate
 
diff --git a/ci/before_install_jython.sh b/ci/before_install_jython.sh
index e3e12e9..a92031f 100755
--- a/ci/before_install_jython.sh
+++ b/ci/before_install_jython.sh
@@ -5,6 +5,7 @@ pip install jip==0.7
 jip install org.python:$JYTHON
 _JYTHON_BASENAME=${JYTHON/:/-}
 OLD_VIRTUAL_ENV=$VIRTUAL_ENV
+deactivate
 java -jar $OLD_VIRTUAL_ENV/javalib/${_JYTHON_BASENAME}.jar -s -d ~/jython
 touch requirements.txt
 BEFORE_PY_26=$(~/jython/bin/jython -c "import sys; print sys.version_info < (2, 6)")