diff options
| author | Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> | 2010-05-19 16:21:25 +0200 |
|---|---|---|
| committer | Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> | 2010-05-19 16:21:25 +0200 |
| commit | 7423fbf04e7c20b79c4c1304069b312355777a1f (patch) | |
| tree | 63cef4604d8be11724d4d80f189c699071be7084 /setuptools/command/easy_install.py | |
| parent | 92f39994d2c6c711fbd73a5589d4de7b0ed1b72a (diff) | |
| parent | 4fd89d186d4e968b7f5e99570b1e424d4c87148a (diff) | |
| download | external_python_setuptools-7423fbf04e7c20b79c4c1304069b312355777a1f.tar.gz external_python_setuptools-7423fbf04e7c20b79c4c1304069b312355777a1f.tar.bz2 external_python_setuptools-7423fbf04e7c20b79c4c1304069b312355777a1f.zip | |
merge
--HG--
branch : distribute
extra : rebase_source : fe09c40bed001a273328dbd39b764a784c6448eb
Diffstat (limited to 'setuptools/command/easy_install.py')
| -rwxr-xr-x | setuptools/command/easy_install.py | 5 |
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 |