aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/command/install.py
diff options
context:
space:
mode:
authorPJ Eby <distutils-sig@python.org>2006-07-18 16:03:45 +0000
committerPJ Eby <distutils-sig@python.org>2006-07-18 16:03:45 +0000
commit5afddb363fe7156d26d7faf0c3cc51e7a4c14fc6 (patch)
tree850b5dcc2d9733744a586aafbd4f056555cbef37 /setuptools/command/install.py
parent403e6845234a3eb83b5e2858edb5e204f6641842 (diff)
downloadexternal_python_setuptools-5afddb363fe7156d26d7faf0c3cc51e7a4c14fc6.tar.gz
external_python_setuptools-5afddb363fe7156d26d7faf0c3cc51e7a4c14fc6.tar.bz2
external_python_setuptools-5afddb363fe7156d26d7faf0c3cc51e7a4c14fc6.zip
Support ``extra_path`` option to ``setup()`` when ``install`` is run in
backward-compatibility mode. (backport from trunk) --HG-- branch : setuptools-0.6 extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4050700
Diffstat (limited to 'setuptools/command/install.py')
-rw-r--r--setuptools/command/install.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/setuptools/command/install.py b/setuptools/command/install.py
index 7221b171..b9ceea9c 100644
--- a/setuptools/command/install.py
+++ b/setuptools/command/install.py
@@ -40,10 +40,16 @@ class install(_install):
)
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 @@ class install(_install):
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 @@ class install(_install):
_install.run(self)
else:
self.do_egg_install()
-
-
-
-
-
-
@@ -120,4 +120,4 @@ class install(_install):
-
+#