Show
Ignore:
Timestamp:
03/07/07 23:33:51 (2 years ago)
Author:
arjanmol
Message:

added state observer documentation (state.txt)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gaphas/trunk/ez_setup.py

    r945 r1149  
    1515""" 
    1616import sys 
    17 DEFAULT_VERSION = "0.6b4" 
     17DEFAULT_VERSION = "0.6c5" 
    1818DEFAULT_URL     = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3] 
    1919 
    …… 
    2727    'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5', 
    2828    'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4', 
     29    'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c', 
     30    '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', 
     36    'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f', 
     37    'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2', 
     38    'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc', 
     39    'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167', 
     40    'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64', 
     41    'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d', 
    2942} 
    3043 
    …… 
    7689        pkg_resources.require("setuptools>="+version) 
    7790 
    78     except pkg_resources.VersionConflict: 
     91    except pkg_resources.VersionConflict, e: 
    7992        # XXX could we install in a subprocess here? 
    8093        print >>sys.stderr, ( 
    8194            "The required version of setuptools (>=%s) is not available, and\n" 
    8295            "can't be installed while this script is running. Please install\n" 
    83             " a more recent version first." 
    84         ) % version 
     96            " a more recent version first.\n\n(Currently using %r)" 
     97        ) % (version, e.args[0]) 
    8598        sys.exit(2) 
    8699 
    …… 
    138151        import setuptools 
    139152    except ImportError: 
    140         import tempfile, shutil 
    141         tmpdir = tempfile.mkdtemp(prefix="easy_install-") 
     153        egg = None 
    142154        try: 
    143             egg = download_setuptools(version, to_dir=tmpdir, delay=0) 
     155            egg = download_setuptools(version, delay=0) 
    144156            sys.path.insert(0,egg) 
    145157            from setuptools.command.easy_install import main 
    146158            return main(list(argv)+[egg])   # we're done here 
    147159        finally: 
    148             shutil.rmtree(tmpdir) 
     160            if egg and os.path.exists(egg): 
     161                os.unlink(egg) 
    149162    else: 
    150163        if setuptools.__version__ == '0.0.1':