diff options
| author | Robby Russell <robby@planetargon.com> | 2015-02-10 07:28:51 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2015-02-10 07:28:51 -0800 |
| commit | 13e5afe805f28749f4aa6a5e82272760a62ad573 (patch) | |
| tree | 228b46be9981f8ed67f34effc774b97825215c12 /plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | |
| parent | 811f1f9eb93c9a8a8c554e0ecd0d7ccb377b5919 (diff) | |
| parent | 833e6f5958b9851d2dbcf8ae706474af4079a25e (diff) | |
| download | zsh-13e5afe805f28749f4aa6a5e82272760a62ad573.tar.gz zsh-13e5afe805f28749f4aa6a5e82272760a62ad573.tar.bz2 zsh-13e5afe805f28749f4aa6a5e82272760a62ad573.zip | |
Merge pull request #3164 from nailor/fix-deactivate-bug
virtualenvwrapper: Deactivate only if in virtualenv
Diffstat (limited to 'plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh')
| -rw-r--r-- | plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh index 52e02d3e0..217ab0722 100644 --- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh +++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh @@ -38,7 +38,7 @@ if (( $+commands[$virtualenvwrapper] )); then source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME" 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 # Note: this only happens if the virtualenv was activated automatically deactivate && unset CD_VIRTUAL_ENV |