Django

Code

Changeset 3903

Show
Ignore:
Timestamp:
10/14/06 12:04:25 (2 years ago)
Author:
adrian
Message:

Fixed #2888 -- Updated ez_setup.py. Setuptools and ez_setup.py suck.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/ez_setup.py

    r3432 r3903  
    1515""" 
    1616import sys 
    17 DEFAULT_VERSION = "0.6c1" 
     17DEFAULT_VERSION = "0.6c3" 
    1818DEFAULT_URL     = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3] 
    1919 
    …… 
    2929    'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c', 
    3030    'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b', 
     31    'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27', 
     32    'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277', 
     33    'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa', 
     34    'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e', 
     35    'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e', 
    3136} 
    3237 
    …… 
    7883        pkg_resources.require("setuptools>="+version) 
    7984 
    80     except pkg_resources.VersionConflict: 
     85    except pkg_resources.VersionConflict, e: 
    8186        # XXX could we install in a subprocess here? 
    8287        print >>sys.stderr, ( 
    8388            "The required version of setuptools (>=%s) is not available, and\n" 
    8489            "can't be installed while this script is running. Please install\n" 
    85             " a more recent version first." 
    86         ) % version 
     90            " a more recent version first.\n\n(Currently using %r)" 
     91        ) % (version, e.args[0]) 
    8792        sys.exit(2) 
    8893 
    …… 
    140145        import setuptools 
    141146    except ImportError: 
    142         import tempfile, shutil 
    143         tmpdir = tempfile.mkdtemp(prefix="easy_install-") 
     147        egg = None 
    144148        try: 
    145             egg = download_setuptools(version, to_dir=tmpdir, delay=0) 
     149            egg = download_setuptools(version, delay=0) 
    146150            sys.path.insert(0,egg) 
    147151            from setuptools.command.easy_install import main 
    148152            return main(list(argv)+[egg])   # we're done here 
    149153        finally: 
    150             shutil.rmtree(tmpdir) 
     154            if egg and os.path.exists(egg): 
     155                os.unlink(egg) 
    151156    else: 
    152157        if setuptools.__version__ == '0.0.1':