diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-03-05 22:12:28 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-03-05 22:12:28 -0500 |
| commit | 23697e49df2ae57278b7c9bcfdb0314ad9118931 (patch) | |
| tree | ba7e280703a02d4cd8fc449b35b5475ad8e90f1a /setuptools/command/easy_install.py | |
| parent | 4368e4a2d3f1e0de7a29b909c2cff599b211a441 (diff) | |
| parent | 41f634812f1ee6b734e7d5fb25486b66ab351d0a (diff) | |
| download | external_python_setuptools-23697e49df2ae57278b7c9bcfdb0314ad9118931.tar.gz external_python_setuptools-23697e49df2ae57278b7c9bcfdb0314ad9118931.tar.bz2 external_python_setuptools-23697e49df2ae57278b7c9bcfdb0314ad9118931.zip | |
Merged in milinnovations/setuptools (pull request #109)
Different treatment of --user option to easy_install (refs #285)
Diffstat (limited to 'setuptools/command/easy_install.py')
| -rwxr-xr-x | setuptools/command/easy_install.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index b039e2da..4e841520 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -152,12 +152,9 @@ class easy_install(Command): create_index = PackageIndex def initialize_options(self): - if site.ENABLE_USER_SITE: - whereami = os.path.abspath(__file__) - self.user = whereami.startswith(site.USER_SITE) - else: - self.user = 0 - + # the --user option seemst to be an opt-in one, + # so the default should be False. + self.user = 0 self.zip_ok = self.local_snapshots_ok = None self.install_dir = self.script_dir = self.exclude_scripts = None self.index_url = None |