diff options
| author | Jay Tavares <jaytavares@gmail.com> | 2019-12-21 00:08:03 -0500 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2019-12-20 21:08:03 -0800 |
| commit | 1a0500b00dd417ea2d9d3ea12bbad5318f8d7e55 (patch) | |
| tree | 96ca27787ab0ab3ed4c71f48ce442512874e7099 /plugins/virtualenvwrapper | |
| parent | 3d6be08e71219e75405ef0d535cc9c3defbb3367 (diff) | |
| download | zsh-1a0500b00dd417ea2d9d3ea12bbad5318f8d7e55.tar.gz zsh-1a0500b00dd417ea2d9d3ea12bbad5318f8d7e55.tar.bz2 zsh-1a0500b00dd417ea2d9d3ea12bbad5318f8d7e55.zip | |
Change order of automatic virtualenv activation/deactivation (#6687)
When navigating from a virtualenv project directory, first deactivate the virtualenv.
Then, check to see if destination directory is also a virtualenv project directory.
If it is activate that virtualenv. See #5817.
Diffstat (limited to 'plugins/virtualenvwrapper')
| -rw-r--r-- | plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh index 2a4b43189..b07b2a306 100644 --- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh +++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh @@ -77,6 +77,12 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then else ENV_NAME="" fi + + 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 + fi if [[ "$ENV_NAME" != "" ]]; then # Activate the environment only if it is not already active if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then @@ -86,10 +92,6 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME" fi fi - 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 fi fi } |