`123510382dae6a950ff50cda60de040ca2932374`

Author: Robby Russell <robby@planetargon.com>
Committer: Robby Russell <robby@planetargon.com>
Date: 2014-03-22 20:28 UTC

Message

Merge pull request #2615 from erbridge/fix_virtualenvwrapper_lazy

Don't lazy load the virtualenvwrapper

Diff

 1diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
 2index 16f32da6e170cd1ab98782c067d3c8c820227fe5..f58bda1ad40a763a733b8532cdd684080bc36173 100644
 3--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
 4+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
 5@@ -1,4 +1,4 @@
 6-virtualenvwrapper='virtualenvwrapper_lazy.sh'
 7+virtualenvwrapper='virtualenvwrapper.sh'
 8 if (( $+commands[$virtualenvwrapper] )); then
 9   source ${${virtualenvwrapper}:c}
10 
11@@ -17,7 +17,7 @@ if (( $+commands[$virtualenvwrapper] )); then
12             # Check for virtualenv name override
13             if [[ -f "$PROJECT_ROOT/.venv" ]]; then
14                 ENV_NAME=`cat "$PROJECT_ROOT/.venv"`
15-            elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then 
16+            elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then
17                 ENV_NAME="$PROJECT_ROOT/.venv"
18             elif [[ "$PROJECT_ROOT" != "." ]]; then
19                 ENV_NAME=`basename "$PROJECT_ROOT"`