[Python-checkins] r50700 - in sandbox/branches/setuptools-0.6: setuptools.txt setuptools/command/install.py
phillip.eby
python-checkins at python.org
Tue Jul 18 18:03:46 CEST 2006
Author: phillip.eby
Date: Tue Jul 18 18:03:45 2006
New Revision: 50700
Modified:
sandbox/branches/setuptools-0.6/setuptools.txt
sandbox/branches/setuptools-0.6/setuptools/command/install.py
Log:
Support ``extra_path`` option to ``setup()`` when ``install`` is run in
backward-compatibility mode. (backport from trunk)
Modified: sandbox/branches/setuptools-0.6/setuptools.txt
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools.txt (original)
+++ sandbox/branches/setuptools-0.6/setuptools.txt Tue Jul 18 18:03:45 2006
@@ -2574,6 +2574,9 @@
* Made ``setup.py develop`` respect the ``--no-deps`` option, which it
previously was ignoring.
+ * Support ``extra_path`` option to ``setup()`` when ``install`` is run in
+ backward-compatibility mode.
+
0.6b4
* Fix ``register`` not obeying name/version set by ``egg_info`` command, if
``egg_info`` wasn't explicitly run first on the same command line.
Modified: sandbox/branches/setuptools-0.6/setuptools/command/install.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/command/install.py (original)
+++ sandbox/branches/setuptools-0.6/setuptools/command/install.py Tue Jul 18 18:03:45 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:
@@ -60,7 +66,7 @@
caller = sys._getframe(2)
caller_module = caller.f_globals.get('__name__','')
caller_name = caller.f_code.co_name
-
+
if caller_module != 'distutils.dist' or caller_name!='run_commands':
# We weren't called from the command line or setup(), so we
# should run in backward-compatibility mode to support bdist_*
@@ -68,12 +74,6 @@
_install.run(self)
else:
self.do_egg_install()
-
-
-
-
-
-
@@ -120,4 +120,4 @@
-
+#
More information about the Python-checkins
mailing list