[Python-checkins] r46782 - in sandbox/branches/setuptools-0.6: EasyInstall.txt setuptools/command/easy_install.py

Fri Jun 9 18:44:16 CEST 2006

Author: phillip.eby
Date: Fri Jun 9 18:44:15 2006
New Revision: 46782
Modified:
 sandbox/branches/setuptools-0.6/EasyInstall.txt
 sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py
Log:
Fix sometimes not detecting local packages installed outside of "site"
directories.
(merge from trunk)
Modified: sandbox/branches/setuptools-0.6/EasyInstall.txt
==============================================================================

--- sandbox/branches/setuptools-0.6/EasyInstall.txt	(original)
+++ sandbox/branches/setuptools-0.6/EasyInstall.txt	Fri Jun 9 18:44:15 2006
@@ -1098,6 +1098,9 @@
 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
Modified: sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py	Fri Jun 9 18:44:15 2006
@@ -171,7 +171,7 @@
 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):
