aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>2010-05-07 00:03:18 +0200
committerRonny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>2010-05-07 00:03:18 +0200
commit152c6fa220df3ce8c3f211d490bfe547b155b0e2 (patch)
treed6df162967d7eab841413bccaba17a33eb89b93b
parentf87d68ef3b1c349dc40b4b3de9e3a2956bce934d (diff)
downloadexternal_python_setuptools-152c6fa220df3ce8c3f211d490bfe547b155b0e2.tar.gz
external_python_setuptools-152c6fa220df3ce8c3f211d490bfe547b155b0e2.tar.bz2
external_python_setuptools-152c6fa220df3ce8c3f211d490bfe547b155b0e2.zip
account for the possibility that site.ENABLE_USER_SITE may be False
--HG-- branch : distribute extra : rebase_source : 4f763cb0a4dd4cddef1df333a4ded2a2728fedcd
-rwxr-xr-xsetuptools/command/easy_install.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 8aab6f1e..d68943fa 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -122,10 +122,9 @@ class easy_install(Command):
create_index = PackageIndex
def initialize_options(self):
- if HAS_USER_SITE:
+ if HAS_USER_SITE and site.ENABLE_USER_SITE:
whereami = os.path.abspath(__file__)
- self.user = (whereami.startswith(site.USER_SITE)
- or whereami.startswith(site.USER_BASE))
+ self.user = whereami.startswith(site.USER_SITE)
else:
self.user = 0