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

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

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):