[Checkins] SVN: zc.buildout/branches/gary-3/bootstrap/bootstrap.py svn merge -r 108901:108902 svn+ssh://svn.zope.org/repos/main/zc.buildout/branches/gary-2
Gary Poster
gary.poster at canonical.com
Wed Feb 10 11:51:57 EST 2010
Log message for revision 108903:
svn merge -r 108901:108902 svn+ssh://svn.zope.org/repos/main/zc.buildout/branches/gary-2
Changed:
U zc.buildout/branches/gary-3/bootstrap/bootstrap.py
-=-
Modified: zc.buildout/branches/gary-3/bootstrap/bootstrap.py
===================================================================
--- zc.buildout/branches/gary-3/bootstrap/bootstrap.py 2010-02-10 16:49:55 UTC (rev 108902)
+++ zc.buildout/branches/gary-3/bootstrap/bootstrap.py 2010-02-10 16:51:56 UTC (rev 108903)
@@ -108,8 +108,10 @@
to_reload = True
raise ImportError
except ImportError:
+ ez_code = urllib2.urlopen(
+ options.setup_source).read().replace('\r\n', '\n')
ez = {}
- exec urllib2.urlopen(options.setup_source).read() in ez
+ exec ez_code in ez
setup_args = dict(to_dir=eggs_dir, download_delay=0)
if options.download_base:
setup_args['download_base'] = options.download_base
More information about the checkins
mailing list