aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/command
diff options
context:
space:
mode:
authorPJ Eby <distutils-sig@python.org>2005-12-01 01:45:39 +0000
committerPJ Eby <distutils-sig@python.org>2005-12-01 01:45:39 +0000
commit969bfb31eb9417ae67d5e78467aeef401dd9bb62 (patch)
tree84f39f9d9eb5bf53575fb2970aa8220141a0e91a /setuptools/command
parent3e8747f6c55ed90706ce6ed9b01ba5503723f7ae (diff)
downloadexternal_python_setuptools-969bfb31eb9417ae67d5e78467aeef401dd9bb62.tar.gz
external_python_setuptools-969bfb31eb9417ae67d5e78467aeef401dd9bb62.tar.bz2
external_python_setuptools-969bfb31eb9417ae67d5e78467aeef401dd9bb62.zip
Made all commands that use ``easy_install`` respect its configuration
options, as this was causing some problems with ``setup.py install`` ignoring global site-dirs settings. --HG-- branch : setuptools extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041573
Diffstat (limited to 'setuptools/command')
-rwxr-xr-xsetuptools/command/develop.py8
-rwxr-xr-xsetuptools/command/easy_install.py22
2 files changed, 15 insertions, 15 deletions
diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index a1f2e763..b6e9d3c7 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -28,10 +28,10 @@ class develop(easy_install):
self.uninstall = None
easy_install.initialize_options(self)
- # Pull in any easy_install configuration options
- self.distribution._set_command_options(
- self, self.distribution.get_option_dict('easy_install')
- )
+
+
+
+
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 47862831..20bdbe89 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -100,6 +100,17 @@ class easy_install(Command):
self.site_dirs = None
self.installed_projects = {}
+ # Always read easy_install options, even if we are subclassed, or have
+ # an independent instance created. This ensures that defaults will
+ # always come from the standard configuration file(s)' "easy_install"
+ # section, even if this is a "develop" or "install" command, or some
+ # other embedding.
+ self._dry_run = None
+ self.verbose = self.distribution.verbose
+ self.distribution._set_command_options(
+ self, self.distribution.get_option_dict('easy_install')
+ )
+
def delete_blockers(self, blockers):
for filename in blockers:
if os.path.exists(filename) or os.path.islink(filename):
@@ -110,17 +121,6 @@ class easy_install(Command):
else:
os.unlink(filename)
-
-
-
-
-
-
-
-
-
-
-
def finalize_options(self):
# If a non-default installation directory was specified, default the
# script directory to match it.