not removing a setuptools instance that is not part of the same root/prefix

--HG--
branch : distribute
extra : rebase_source : 2193299f01f96c29fb447c024b2051c91ae6bb7b

1 files changed, 21 insertions, 0 deletions

diff --git a/distribute_setup.py b/distribute_setup.py
index e50956fd..c2ef008f 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -259,6 +259,20 @@ def before_install():
     log.warn('Before install bootstrap.')
     fake_setuptools()
 
+def _under_prefix(location):
+    args = sys.argv[sys.argv.index('install')+1:]
+
+    for index, arg in enumerate(args):
+        for option in ('--root', '--prefix'):
+            if arg.startswith('%s=' % option):
+                top_dir = arg.split('root=')[-1]
+                return location.startswith(top_dir)
+            elif arg == option:
+                if len(args) > index:
+                    top_dir = args[index+1]
+                    return location.startswith(top_dir)
+    return True
+
 def fake_setuptools():
     log.warn('Scanning installed packages')
     try:
@@ -276,6 +290,13 @@ def fake_setuptools():
     setuptools_location = setuptools_dist.location
     log.warn('Setuptools installation detected at %s' % setuptools_location)
 
+    # if --root or --preix was provided, and if
+    # setuptools is not located in them, we don't patch it
+    if not _under_prefix(setuptools_location):
+        log.warn('Not patching, --root or --prefix is installing Distribute'
+                 ' in another location')
+        return
+
     # let's see if its an egg
     if not setuptools_location.endswith('.egg'):
         log.warn('Non-egg installation')