Commits

Doug Hellmann committed a423ba6

check return code from virtualenvwrapper_verify_workon_home everywhere and return an error code if validation fails

  • Participants
  • Parent commits 3134938

Comments (0)

Files changed (2)

 
 echo
 echo "LISTING ENVIRONMENTS"
-workon
+envs=`workon | tr '\n' ' '`
+if [ "$envs" = "env1 env2 " ]
+then
+    echo "PASS"
+else
+    echo "FAIL: \""$envs\"""
+fi
 
 echo
 echo "REMOVING ENVIRONMENTS"
 rmvirtualenv "env2"
 
 rm -rf $WORKON_HOME
+
+echo
+echo "MISSING WORKON_HOME"
+workon && echo "Failed to detect missing dir" || echo "PASS"
+mkvirtualenv foo && echo "Failed to detect missing dir" || echo "PASS"
+rmvirtualenv foo && echo "Failed to detect missing dir" || echo "PASS"

File virtualenvwrapper_bashrc

 #
 function mkvirtualenv () {
     eval "envname=\$$#"
-    virtualenvwrapper_verify_workon_home
+    virtualenvwrapper_verify_workon_home || return 1
     (cd "$WORKON_HOME"; 
         virtualenv "$@"; 
         virtualenvwrapper_run_hook "./premkvirtualenv" "$envname"
 # Remove an environment, in the WORKON_HOME.
 function rmvirtualenv () {
     typeset env_name="$1"
-    virtualenvwrapper_verify_workon_home
+    virtualenvwrapper_verify_workon_home || return 1
     if [ "$env_name" = "" ]
     then
         echo "Please specify an enviroment."
 
 # List the available environments.
 function virtualenvwrapper_show_workon_options () {
-    virtualenvwrapper_verify_workon_home
+    virtualenvwrapper_verify_workon_home || return 1
 	find "$WORKON_HOME" -maxdepth 1 -mindepth 1 -type d -exec basename '{}' \; | sort
 }