From 969bfb31eb9417ae67d5e78467aeef401dd9bb62 Mon Sep 17 00:00:00 2001 From: PJ Eby Date: Thu, 1 Dec 2005 01:45:39 +0000 Subject: 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 --- setuptools/command/easy_install.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'setuptools/command/easy_install.py') 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. -- cgit v1.2.1