diff options
| -rw-r--r-- | setuptools/command/install.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/setuptools/command/install.py b/setuptools/command/install.py index acbe8ade..f438dda6 100644 --- a/setuptools/command/install.py +++ b/setuptools/command/install.py @@ -1,8 +1,8 @@ -import setuptools +import setuptools, sys from distutils.command.install import install as _install class install(_install): - """Build dependencies before installation""" + """Use easy_install to install the package, w/dependencies""" def handle_extra_path(self): # We always ignore extra_path, because we always install eggs @@ -11,6 +11,16 @@ class install(_install): self.extra_dirs = '' def run(self): + calling_module = sys._getframe(1).f_globals.get('__name__','') + if calling_module != 'distutils.dist': + # We're not being run from the command line, so use old-style + # behavior. This is a bit kludgy, because a command might use + # dist.run_command() to run 'install', but bdist_dumb and + # bdist_wininst both call run directly at the moment. + # When this is part of the distutils, the old install behavior + # should probably be requested with a flag, or a different method. + return _install.run(self) + from setuptools.command.easy_install import easy_install cmd = easy_install( self.distribution, args="x", ignore_conflicts_at_my_risk=1 @@ -28,4 +38,3 @@ class install(_install): cmd.run() setuptools.bootstrap_install_from = None - |