Fixed ``.pth`` file processing picking up nested eggs (i.e. ones inside

"baskets") when they weren't explicitly listed in the ``.pth`` file.

--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041477

2 files changed, 8 insertions, 3 deletions

diff --git a/EasyInstall.txt b/EasyInstall.txt
index c2eb36ab..327d63c6 100755
--- a/EasyInstall.txt
+++ b/EasyInstall.txt
@@ -865,6 +865,11 @@ Known Issues
  * There's no automatic retry for borked Sourceforge mirrors, which can easily
    time out or be missing a file.
 
+0.6a9
+
+ * Fixed ``.pth`` file processing picking up nested eggs (i.e. ones inside
+   "baskets") when they weren't explicitly listed in the ``.pth`` file.
+
 0.6a8
  * Update for changed SourceForge mirror format
  
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 1d0f1188..47862831 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1112,9 +1112,9 @@ class PthDistributions(Environment):
 
     def __init__(self, filename):
         self.filename = filename; self._load()
-        Environment.__init__(
-            self, list(yield_lines(self.paths)), None, None
-        )
+        Environment.__init__(self, [], None, None)
+        for path in yield_lines(self.paths):
+            map(self.add, find_distributions(path, True))
 
     def _load(self):
         self.paths = []