Commit 2119b6b2 authored by Łukasz Nowak's avatar Łukasz Nowak

- update to 115416

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@37922 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 6535ab54
############################################################################## ##############################################################################
# #
# Copyright (c) 2006 Zope Corporation and Contributors. # Copyright (c) 2006 Zope Foundation and Contributors.
# All Rights Reserved. # All Rights Reserved.
# #
# This software is subject to the provisions of the Zope Public License, # This software is subject to the provisions of the Zope Public License,
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
Simply run this script in a directory containing a buildout.cfg. Simply run this script in a directory containing a buildout.cfg.
The script accepts buildout command-line options, so you can The script accepts buildout command-line options, so you can
use the -c option to specify an alternate configuration file. use the -c option to specify an alternate configuration file.
$Id$
""" """
import os, shutil, sys, tempfile, urllib2 import os, shutil, sys, tempfile, urllib2
...@@ -53,11 +51,10 @@ else: ...@@ -53,11 +51,10 @@ else:
USE_DISTRIBUTE = options.distribute USE_DISTRIBUTE = options.distribute
args = args + ['bootstrap'] args = args + ['bootstrap']
to_reload = False
try: try:
import pkg_resources import pkg_resources
import setuptools
if not hasattr(pkg_resources, '_distribute'): if not hasattr(pkg_resources, '_distribute'):
to_reload = True
raise ImportError raise ImportError
except ImportError: except ImportError:
ez = {} ez = {}
...@@ -70,9 +67,7 @@ except ImportError: ...@@ -70,9 +67,7 @@ except ImportError:
).read() in ez ).read() in ez
ez['use_setuptools'](to_dir=tmpeggs, download_delay=0) ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
if to_reload: reload(sys.modules['pkg_resources'])
reload(pkg_resources)
else:
import pkg_resources import pkg_resources
if sys.platform == 'win32': if sys.platform == 'win32':
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment