68d51bd7d83050589ca602059a6e2fb26c2cec39

 1diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
 2index 2cbfc47d58239ecec8aed2ec4f7882a80a6e834c..88217a7f5bcc74a7bc8c7573b0db829cca850bd2 100644
 3--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
 4+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
 5@@ -1,23 +1,24 @@
 6 function {
 7     # search in these locations for the init script:
 8-    for f in $commands[virtualenvwrapper_lazy.sh] \
 9-             $commands[virtualenvwrapper.sh] \
10-             /usr/share/virtualenvwrapper/virtualenvwrapper{_lazy,}.sh \
11-             /usr/local/bin/virtualenvwrapper{_lazy,}.sh \
12-             /etc/bash_completion.d/virtualenvwrapper \
13-             /usr/share/bash-completion/completions/virtualenvwrapper \
14-             $HOME/.local/bin/virtualenvwrapper.sh
15+    for virtualenvwrapper in $commands[virtualenvwrapper_lazy.sh] \
16+      $commands[virtualenvwrapper.sh] \
17+      /usr/share/virtualenvwrapper/virtualenvwrapper{_lazy,}.sh \
18+      /usr/local/bin/virtualenvwrapper{_lazy,}.sh \
19+      /etc/bash_completion.d/virtualenvwrapper \
20+      /usr/share/bash-completion/completions/virtualenvwrapper \
21+      $HOME/.local/bin/virtualenvwrapper.sh
22     do
23-        if [[ -f $f ]]; then
24-            source $f
25+        if [[ -f "$virtualenvwrapper" ]]; then
26+            source "$virtualenvwrapper"
27             return
28         fi
29     done
30     print "[oh-my-zsh] virtualenvwrapper plugin: Cannot find virtualenvwrapper.sh.\n"\
31           "Please install with \`pip install virtualenvwrapper\`" >&2
32+    return 1
33 }
34 
35-if ! type workon &>/dev/null; then
36+if [[ $? -eq 0 ]] && ! type workon &>/dev/null; then
37   print "[oh-my-zsh] virtualenvwrapper plugin: shell function 'workon' not defined.\n"\
38         "Please check ${virtualenvwrapper}" >&2
39   return