Commit 969bfb31 authored by PJ Eby's avatar PJ Eby

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
parent 3e8747f6
......@@ -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.
......
......@@ -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')
)
......
......@@ -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.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment