Commit 14f5c7d6 authored by Jim Fulton's avatar Jim Fulton

merge master

parents b9138c32 b83d945f
......@@ -3,3 +3,6 @@ bin/
build/
develop-eggs/
eggs/
*.pyc
*.egg
*.egg-info
......@@ -44,4 +44,4 @@ Buildout is a project designed to solve 2 problems:
distribution, there can only be one installed.
To learn more about buildout, including how to use it, see the
``Buildout Documentation <http://packages.python.org/buildout/>``_.
`Buildout Documentation <http://packages.python.org/buildout/>`_.
......@@ -26,6 +26,20 @@ for d in 'eggs', 'develop-eggs', 'bin', 'parts':
if os.path.isdir('build'):
shutil.rmtree('build')
nosite = 'site' not in sys.modules
######################################################################
# Make sure we have a relatively clean environment
try:
import pkg_resources, setuptools
except ImportError:
pass
else:
raise SystemError(
"Buildout development with a pre-installed setuptools or "
"distribute is not supported.%s"
% ('' if nosite else ' Try running with -S option to Python.'))
######################################################################
# handle -S
......@@ -35,7 +49,6 @@ def normpath(p):
else:
return p
nosite = 'site' not in sys.modules
if nosite:
# They've asked not to import site. Cool, but distribute is going to
# import it anyway, so we're going to have to clean up. :(
......
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