prelude-correlator/master: ez_setup.py attempted to download inexistant setuptools version

commit f9fc0099aa838b491ce872ea70384bd9df24b711
Author: Yoann Vandoorselaere <[email protected]>
Date:   Sat Jan 16 17:16:40 2010 +0100

    ez_setup.py attempted to download inexistant setuptools version
    
    This is a regression of commit 6f9328ecd837da5cfbe9b6bd6614020e95d3e8e2,
    where we lowered setuptools requirement so that prelude-correlator would
    work out of the box with most distribution setuptools package.
    
    However, in case where setuptools isn't available on the system, and
    ez_setup.py attempt to download it, old setuptools version packages
    are not available for newer Python version.
    
    Fix this problem by forcing a recent version specifically when
    downloading setuptools.


========================================

 ez_setup.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

========================================

diff --git a/ez_setup.py b/ez_setup.py
index 0a91cc6..2a14a63 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -14,6 +14,7 @@ the appropriate options to ``use_setuptools()``.
 This file can also be run as a script to install or upgrade setuptools.
 """
 import sys
+DOWNLOAD_VERSION = "0.6c11"
 DEFAULT_VERSION = "0.6c1"
 DEFAULT_URL     = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
 
@@ -94,13 +95,13 @@ def use_setuptools(
     """
     was_imported = 'pkg_resources' in sys.modules or 'setuptools' in sys.modules
     def do_download():
-        egg = download_setuptools(version, download_base, to_dir, download_delay)
+        egg = download_setuptools(DOWNLOAD_VERSION, download_base, to_dir, download_delay)
         sys.path.insert(0, egg)
         import setuptools; setuptools.bootstrap_install_from = egg
     try:
         import pkg_resources
     except ImportError:
-        return do_download()       
+        return do_download()
     try:
         pkg_resources.require("setuptools>="+version); return
     except pkg_resources.VersionConflict, e:
_______________________________________________
Prelude-cvslog site list
[email protected]
http://lists.prelude-ids.org/mailman/listinfo/prelude-cvslog