[Python-checkins] commit of r41573 - in sandbox/trunk/setuptools: . setuptools/command

Thu Dec 1 02:45:43 CET 2005

Author: phillip.eby
Date: Thu Dec 1 02:45:39 2005
New Revision: 41573
Modified:
 sandbox/trunk/setuptools/setuptools.txt
 sandbox/trunk/setuptools/setuptools/command/develop.py
 sandbox/trunk/setuptools/setuptools/command/easy_install.py
Log:
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.
Modified: sandbox/trunk/setuptools/setuptools.txt
==============================================================================

--- sandbox/trunk/setuptools/setuptools.txt	(original)
+++ sandbox/trunk/setuptools/setuptools.txt	Thu Dec 1 02:45:39 2005
@@ -2174,6 +2174,9 @@
 requiring ``nose`` to run unit tests can make this dependency optional
 unless the ``test`` command is run.
 
+ * Made all commands that use ``easy_install`` respect its configuration
+ options, as this was causing some problems with ``setup.py install``.
+
 0.6a8
 * Fixed some problems building extensions when Pyrex was installed, especially
 with Python 2.4 and/or packages using SWIG.
Modified: sandbox/trunk/setuptools/setuptools/command/develop.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/command/develop.py	(original)
+++ sandbox/trunk/setuptools/setuptools/command/develop.py	Thu Dec 1 02:45:39 2005
@@ -28,10 +28,10 @@
 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')
- )
+
+
+
+
 
 
 
Modified: sandbox/trunk/setuptools/setuptools/command/easy_install.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/command/easy_install.py	(original)
+++ sandbox/trunk/setuptools/setuptools/command/easy_install.py	Thu Dec 1 02:45:39 2005
@@ -100,6 +100,17 @@
 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 @@
 else:
 os.unlink(filename)
 
-
-
-
-
-
-
-
-
-
-
-
 def finalize_options(self):
 # If a non-default installation directory was specified, default the
 # script directory to match it.
