diff options
| author | Zachary Cutlip <uid000@gmail.com> | 2022-02-10 07:25:23 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-10 16:25:23 +0100 |
| commit | 1e615b71d636c3697d7e4aee8fbcd1dc01fd7da3 (patch) | |
| tree | d66350e518014dbc7eeeb3837cb72259358160b0 /plugins/virtualenvwrapper | |
| parent | 0da33ca22be19452e26ed44aef8e99972d0bf866 (diff) | |
| download | zsh-1e615b71d636c3697d7e4aee8fbcd1dc01fd7da3.tar.gz zsh-1e615b71d636c3697d7e4aee8fbcd1dc01fd7da3.tar.bz2 zsh-1e615b71d636c3697d7e4aee8fbcd1dc01fd7da3.zip | |
fix(virtualenvwrapper): only deactivate if virtual env is still present (#10671)
Diffstat (limited to 'plugins/virtualenvwrapper')
| -rw-r--r-- | plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh index c30216f51..d359e0c21 100644 --- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh +++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh @@ -56,7 +56,13 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then if [[ -n $CD_VIRTUAL_ENV && "$ENV_NAME" != "$CD_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 + if [[ -n "$VIRTUAL_ENV" ]]; then + # Only deactivate if VIRTUAL_ENV was set + # User may have deactivated manually or via another mechanism + deactivate + fi + # clean up regardless + unset CD_VIRTUAL_ENV fi if [[ "$ENV_NAME" != "" ]]; then # Activate the environment only if it is not already active |