Commit 3bd27714 authored by Reinout van Rees's avatar Reinout van Rees

Detecting buildout by looking in os.environ['_'] to see if it is a buildout

command.  If that is the case: do not fake setuptools, just let yourself be
installed as a buildout-managed egg.

--HG--
branch : distribute
extra : rebase_source : 03ae13a4b93098ba76b971f26a01070ad47e361a
parent 7ed4be90
......@@ -39,6 +39,7 @@ SETUP_COMMANDS = d['__all__']
VERSION = "0.6.5"
from setuptools import setup, find_packages
import os
import sys
scripts = []
......@@ -48,7 +49,15 @@ def _easy_install_marker():
return (len(sys.argv) == 5 and sys.argv[2] == 'bdist_egg' and
sys.argv[3] == '--dist-dir' and 'egg-dist-tmp-' in sys.argv[-1])
def _buildout_marker():
command = os.environ.get('_')
if command:
return 'buildout' in os.path.basename(command)
def _being_installed():
if _buildout_marker():
# Installed by buildout, don't mess with a global setuptools.
return False
# easy_install marker
return 'install' in sys.argv[1:] or _easy_install_marker()
......
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