aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPJ Eby <distutils-sig@python.org>2006-06-09 16:44:15 +0000
committerPJ Eby <distutils-sig@python.org>2006-06-09 16:44:15 +0000
commit455c461299b6527ef7cab98e6f95666118a8e22e (patch)
tree76f7201bdc0704388467a9622c4957115c8df3af
parent812d9964a9831218e3f19827c94f85a9047774db (diff)
downloadexternal_python_setuptools-455c461299b6527ef7cab98e6f95666118a8e22e.tar.gz
external_python_setuptools-455c461299b6527ef7cab98e6f95666118a8e22e.tar.bz2
external_python_setuptools-455c461299b6527ef7cab98e6f95666118a8e22e.zip
Fix sometimes not detecting local packages installed outside of "site"
directories. (merge from trunk) --HG-- branch : setuptools-0.6 extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4046782
-rwxr-xr-xEasyInstall.txt3
-rwxr-xr-xsetuptools/command/easy_install.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/EasyInstall.txt b/EasyInstall.txt
index f1271647..4263c4ff 100755
--- a/EasyInstall.txt
+++ b/EasyInstall.txt
@@ -1098,6 +1098,9 @@ Release Notes/Change History
0.6b3
* Fix local --find-links eggs not being copied except with --always-copy.
+ * Fix sometimes not detecting local packages installed outside of "site"
+ directories.
+
0.6b2
* Don't install or update a ``site.py`` patch when installing to a
``PYTHONPATH`` directory with ``--multi-version``, unless an
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 3a244470..eff60cf8 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -171,7 +171,7 @@ class easy_install(Command):
self.package_index = self.create_index(
self.index_url, search_path = self.shadow_path, hosts=hosts
)
- self.local_index = Environment(self.shadow_path)
+ self.local_index = Environment(self.shadow_path+sys.path)
if self.find_links is not None:
if isinstance(self.find_links, basestring):