[Python-checkins] r50699 - sandbox/trunk/setuptools/setuptools/command/install.py

[phillip.eby]

Author: phillip.eby
Date: Tue Jul 18 17:59:46 2006
New Revision: 50699

Modified:
   sandbox/trunk/setuptools/setuptools/command/install.py
Log:
Restored support for extra_path when using backward compatibility mode.


Modified: sandbox/trunk/setuptools/setuptools/command/install.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/command/install.py	(original)
+++ sandbox/trunk/setuptools/setuptools/command/install.py	Tue Jul 18 17:59:46 2006
@@ -40,10 +40,16 @@
                 )
 
     def handle_extra_path(self):
-        # We always ignore extra_path, because we install as .egg or .egg-info
+        if self.root or self.single_version_externally_managed:
+            # explicit backward-compatibility mode, allow extra_path to work
+            return _install.handle_extra_path(self)
+
+        # Ignore extra_path when installing an egg (or being run by another
+        # command without --root or --single-version-externally-managed
         self.path_file = None
         self.extra_dirs = ''
 
+
     def run(self):
         # Explicit request for old-style install?  Just do it
         if self.old_and_unmanageable or self.single_version_externally_managed:
@@ -74,12 +80,6 @@
 
 
 
-
-
-
-
-
-
     def do_egg_install(self):
 
         from setuptools.command.easy_install import easy_install
@@ -99,3 +99,25 @@
         cmd.args = args
         cmd.run()
         setuptools.bootstrap_install_from = None
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#