adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3164 from nailor/fix-deactivate-bug

Browse Source 
virtualenvwrapper: Deactivate only if in virtualenv
This commit is contained in:
Robby Russell 2015-02-10 07:28:51 -08:00
commit 13e5afe805
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
View File

@ -38,7 +38,7 @@ if (( $+commands[$virtualenvwrapper] )); then
source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME" source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME"
fi fi
fi fi
elif [ $CD_VIRTUAL_ENV ]; then elif [[ -n $CD_VIRTUAL_ENV && -n $VIRTUAL_ENV ]]; then
# We've just left the repo, deactivate the environment # We've just left the repo, deactivate the environment
# Note: this only happens if the virtualenv was activated automatically # Note: this only happens if the virtualenv was activated automatically
deactivate && unset CD_VIRTUAL_ENV deactivate && unset CD_VIRTUAL_ENV