From 9b2b3f6a9a669d65f621aa3a5223301dcf965a4b Mon Sep 17 00:00:00 2001 From: rhlobo Date: Sat, 15 Dec 2012 20:15:29 -0200 Subject: [PATCH] Modified virtualenvwrapper plugin to prevent a possible circular execution that may happen when activating an environment. --- plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh index 0ed2565b4..bbfe10bcf 100644 --- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh +++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh @@ -19,7 +19,10 @@ if [[ -f "$wrapsource" ]]; then # Activate the environment only if it is not already active if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then - workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME" + if [[ -z ${CD_VIRTUAL_ENV} ]]; then + export CD_VIRTUAL_ENV="$ENV_NAME" + workon "$ENV_NAME" || unset CD_VIRTUAL_ENV + fi fi fi elif [ $CD_VIRTUAL_ENV ]; then