diff options
| -rwxr-xr-x | setuptools.txt | 3 | ||||
| -rwxr-xr-x | setuptools/command/develop.py | 8 | ||||
| -rwxr-xr-x | setuptools/command/easy_install.py | 22 |
3 files changed, 18 insertions, 15 deletions
diff --git a/setuptools.txt b/setuptools.txt index a0d444e1..610ad49a 100755 --- a/setuptools.txt +++ b/setuptools.txt @@ -2174,6 +2174,9 @@ Release Notes/Change History 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. 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. |