summaryrefslogtreecommitdiff
path: root/setuptools/command
diff options
context:
space:
mode:
authorPJ Eby <distutils-sig@python.org>2005-11-18 15:00:50 +0000
committerPJ Eby <distutils-sig@python.org>2005-11-18 15:00:50 +0000
commit82f063f0169698f55fd4234c47458ba50f3a2e30 (patch)
tree8decfb165272b3af39238832a1a34dec9f6e7257 /setuptools/command
parentb73cc53b533013b7fede38ef198457256c799640 (diff)
downloadpython-setuptools-git-82f063f0169698f55fd4234c47458ba50f3a2e30.tar.gz
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
Diffstat (limited to 'setuptools/command')
-rwxr-xr-xsetuptools/command/easy_install.py6
1 files changed, 3 insertions, 3 deletions
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 = []