aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/command/easy_install.py
diff options
context:
space:
mode:
authormatej <none@none>2014-11-18 14:38:56 +0100
committermatej <none@none>2014-11-18 14:38:56 +0100
commit41f634812f1ee6b734e7d5fb25486b66ab351d0a (patch)
tree0f1a6c733f76acbcf349a048ab3021c7d3c6a84a /setuptools/command/easy_install.py
parentaffa001a6767efee24b4d6bc1a2f04eb7aeea65b (diff)
downloadexternal_python_setuptools-41f634812f1ee6b734e7d5fb25486b66ab351d0a.tar.gz
external_python_setuptools-41f634812f1ee6b734e7d5fb25486b66ab351d0a.tar.bz2
external_python_setuptools-41f634812f1ee6b734e7d5fb25486b66ab351d0a.zip
Different treatment of --user option to easy_install (refs #285)
Diffstat (limited to 'setuptools/command/easy_install.py')
-rwxr-xr-xsetuptools/command/easy_install.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 2e00b996..d0bae2b2 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -148,12 +148,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