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

virtualenvwrapper: add the option DEACTIVATE_VENV_ASAP to cope with issue #4603

Browse Source
This commit is contained in:
Tristan Mahé 2015-11-12 09:59:08 -08:00
parent a6ef00280a
commit acb0a82c1d
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

@ -61,7 +61,7 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
else else
ENV_NAME="" ENV_NAME=""
fi fi
if [[ "$ENV_NAME" != "" && ("$ENV_NAME" = "$CD_VIRTUAL_ENV" || "$CD_VIRTUAL_ENV" = "" ) ]]; then if [[ "$ENV_NAME" != "" && ( ($DEACTIVATE_VENV_ASAP -eq 1 && ("$ENV_NAME" = "$CD_VIRTUAL_ENV" || "$CD_VIRTUAL_ENV" = "") ) || (-z $DEACTIVATE_VENV_ASAP || $DEACTIVATE_VENV_ASAP -eq 0 ) ) ]]; then
# Activate the environment only if it is not already active # Activate the environment only if it is not already active
if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then