[Python-checkins] commit of r41477 - in sandbox/trunk/setuptools: . setuptools/command
phillip.eby@python.org
phillip.eby at python.org
Fri Nov 18 16:00:50 CET 2005
Author: phillip.eby
Date: Fri Nov 18 16:00:50 2005
New Revision: 41477
Modified:
sandbox/trunk/setuptools/EasyInstall.txt
sandbox/trunk/setuptools/setuptools/command/easy_install.py
Log:
Fixed ``.pth`` file processing picking up nested eggs (i.e. ones inside
"baskets") when they weren't explicitly listed in the ``.pth`` file.
Modified: sandbox/trunk/setuptools/EasyInstall.txt
==============================================================================
--- sandbox/trunk/setuptools/EasyInstall.txt (original)
+++ sandbox/trunk/setuptools/EasyInstall.txt Fri Nov 18 16:00:50 2005
@@ -865,6 +865,11 @@
* 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
Modified: sandbox/trunk/setuptools/setuptools/command/easy_install.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/command/easy_install.py (original)
+++ sandbox/trunk/setuptools/setuptools/command/easy_install.py Fri Nov 18 16:00:50 2005
@@ -1112,9 +1112,9 @@
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 = []
More information about the Python-checkins
mailing list