diff options
Diffstat (limited to 'virtualenv.py')
| -rw-r--r-- | virtualenv.py | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/virtualenv.py b/virtualenv.py index 331c5c5..c173dd4 100644 --- a/virtualenv.py +++ b/virtualenv.py @@ -4,7 +4,7 @@ # If you change the version here, change it in setup.py # and docs/conf.py as well. -virtualenv_version = "1.6.3" +virtualenv_version = "1.6.4" import base64 import sys @@ -487,16 +487,17 @@ def _install_req(py_executable, unzip=False, distribute=False, sys.path = sys.path[1:] try: - # check if the global Python has distribute installed or plain - # setuptools - import pkg_resources - if not hasattr(pkg_resources, '_distribute'): - location = os.path.dirname(pkg_resources.__file__) - logger.notify("A globally installed setuptools was found (in %s)" % location) - logger.notify("Use the --no-site-packages option to use distribute in " - "the virtualenv.") - except ImportError: - pass + try: + # check if the global Python has distribute installed or plain + # setuptools + import pkg_resources + if not hasattr(pkg_resources, '_distribute'): + location = os.path.dirname(pkg_resources.__file__) + logger.notify("A globally installed setuptools was found (in %s)" % location) + logger.notify("Use the --no-site-packages option to use distribute in " + "the virtualenv.") + except ImportError: + pass finally: sys.path = _prev_sys_path |