Commits

Doug Hellmann committed f7299e0

shortcut initialization if it has run before

  • Participants
  • Parent commits 4ee77b7

Comments (0)

Files changed (4)

docs/en/history.rst

   - Drops support for Python 2.4 and 2.5. The tools may still work,
     but I no longer have a development environment set up for testing
     them, so I do not officially support them.
+  - Shortcut initialization if it has run before.
 
 2.10.1
 
 setUp () {
     echo
     rm -f "$test_dir/catch_output"
+    unset VIRTUALENVWRAPPER_INITIALIZED
 }
 
 test_virtualenvwrapper_initialize() {

tests/test_project.sh

 setUp () {
     echo
     rm -f "$test_dir/catch_output"
+    unset VIRTUALENVWRAPPER_INITIALIZED
 }
 
 test_initialize() {

virtualenvwrapper.sh

 
 # Set up virtualenvwrapper properly
 function virtualenvwrapper_initialize {
+    if [ ! -z "$VIRTUALENVWRAPPER_INITIALIZED" ]
+    then
+        return 0
+    fi
     export WORKON_HOME="$(virtualenvwrapper_derive_workon_home)"
 
     virtualenvwrapper_verify_workon_home -q || return 1
 
     virtualenvwrapper_setup_tab_completion
 
+    export VIRTUALENVWRAPPER_INITIALIZED=1
+
+    return 0
 }