[Python-checkins] python/nondist/sandbox/setuptools/setuptools/command install.py, 1.3, 1.4

[pje@users.sourceforge.net]

Update of /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13707/setuptools/command

Modified Files:
	install.py 
Log Message:
Fixed breakage of bdist_* commands that call the 'install' command.


Index: install.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command/install.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- install.py	6 Aug 2005 19:29:49 -0000	1.3
+++ install.py	11 Aug 2005 14:58:54 -0000	1.4
@@ -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 @@
         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 @@
         cmd.run()
         setuptools.bootstrap_install_from = None
 
-