[Checkins] SVN: lovely.remotetask/trunk/bootstrap.py New version for bootstrap.py

Jürgen Kartnaller juergen at kartnaller.at
Wed Jun 6 08:43:09 EDT 2007


Log message for revision 76403:
  New version for bootstrap.py

Changed:
  U   lovely.remotetask/trunk/bootstrap.py

-=-
Modified: lovely.remotetask/trunk/bootstrap.py
===================================================================
--- lovely.remotetask/trunk/bootstrap.py	2007-06-06 12:37:51 UTC (rev 76402)
+++ lovely.remotetask/trunk/bootstrap.py	2007-06-06 12:43:08 UTC (rev 76403)
@@ -24,12 +24,15 @@
 
 tmpeggs = tempfile.mkdtemp()
 
-ez = {}
-exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
-                     ).read() in ez
-ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
+try:
+    import pkg_resources
+except ImportError:
+    ez = {}
+    exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
+                         ).read() in ez
+    ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
 
-import pkg_resources
+    import pkg_resources
 
 cmd = 'from setuptools.command.easy_install import main; main()'
 if sys.platform == 'win32':
@@ -50,3 +53,4 @@
 import zc.buildout.buildout
 zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap'])
 shutil.rmtree(tmpeggs)
+



More information about the Checkins mailing list