Author: phillip.eby
Date: Tue Jan 15 18:46:13 2008
New Revision: 59981
Modified:
sandbox/branches/setuptools-0.6/EasyInstall.txt
sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py
Log:
Fix not picking up dependency links from recursive dependencies.
(backport 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 Tue Jan 15 18:46:13 2008
@@ -1239,6 +1239,8 @@
* Fixed GUI scripts sometimes not executing on Windows
+ * Fixed not picking up dependency links from recursive dependencies.
+
0.6c7
* ``ftp:`` download URLs now work correctly.
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 Tue Jan 15 18:46:13 2008
@@ -497,6 +497,10 @@
self.install_egg_scripts(dist)
self.installed_projects[dist.key] = dist
log.info(self.installation_report(requirement, dist, *info))
+ if dist.has_metadata('dependency_links.txt'):
+ self.package_index.add_find_links(
+ dist.get_metadata_lines('dependency_links.txt')
+ )
if not deps and not self.always_copy:
return
elif requirement is not None and dist.key != requirement.key:
@@ -509,10 +513,6 @@
requirement = Requirement(
distreq.project_name, distreq.specs, requirement.extras
)
- if dist.has_metadata('dependency_links.txt'):
- self.package_index.add_find_links(
- dist.get_metadata_lines('dependency_links.txt')
- )
log.info("Processing dependencies for %s", requirement)
try:
distros = WorkingSet([]).resolve(