From 5b3b909089c8df0d17420135a84f21ec572e72fe Mon Sep 17 00:00:00 2001
From: Yamashita Yuu <yamashita@geishatokyo.com>
Date: Fri, 4 Jul 2014 20:33:22 +0900
Subject: [PATCH] Exit as error on deactivation failures

---
 bin/pyenv-sh-deactivate |  6 ++++++
 test/deactivate.bats    | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/bin/pyenv-sh-deactivate b/bin/pyenv-sh-deactivate
index a2a1d1f..3626b14 100755
--- a/bin/pyenv-sh-deactivate
+++ b/bin/pyenv-sh-deactivate
@@ -30,6 +30,9 @@ fish )
   cat <<EOS
   setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
   deactivate;
+else
+  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
+  false;
 end;
 EOS
   ;;
@@ -37,6 +40,9 @@ EOS
   cat <<EOS
   export PYENV_DEACTIVATE="\$VIRTUAL_ENV";
   deactivate;
+else
+  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
+  false;
 fi;
 EOS
   ;;
diff --git a/test/deactivate.bats b/test/deactivate.bats
index 67faa2f..f88e5cf 100644
--- a/test/deactivate.bats
+++ b/test/deactivate.bats
@@ -16,6 +16,9 @@ setup() {
 if declare -f deactivate 1>/dev/null 2>&1; then
   export PYENV_DEACTIVATE="\$VIRTUAL_ENV";
   deactivate;
+else
+  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
+  false;
 fi;
 EOS
 }
@@ -31,6 +34,9 @@ if declare -f deactivate 1>/dev/null 2>&1; then
   pyenv shell --unset;
   export PYENV_DEACTIVATE="\$VIRTUAL_ENV";
   deactivate;
+else
+  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
+  false;
 fi;
 EOS
 }
@@ -45,6 +51,9 @@ EOS
 if functions -q deactivate
   setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
   deactivate;
+else
+  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
+  false;
 end;
 EOS
 }
@@ -60,6 +69,9 @@ if functions -q deactivate
   pyenv shell --unset;
   setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
   deactivate;
+else
+  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
+  false;
 end;
 EOS
 }