Commit 00e90f6a authored by PJ Eby's avatar PJ Eby

Fix not picking up dependency links from recursive dependencies.

(backport from trunk)

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4059981
parent 8e3c998e
...@@ -1239,6 +1239,8 @@ Release Notes/Change History ...@@ -1239,6 +1239,8 @@ Release Notes/Change History
* Fixed GUI scripts sometimes not executing on Windows * Fixed GUI scripts sometimes not executing on Windows
* Fixed not picking up dependency links from recursive dependencies.
0.6c7 0.6c7
* ``ftp:`` download URLs now work correctly. * ``ftp:`` download URLs now work correctly.
......
...@@ -497,6 +497,10 @@ Please make the appropriate changes for your system and try again. ...@@ -497,6 +497,10 @@ Please make the appropriate changes for your system and try again.
self.install_egg_scripts(dist) self.install_egg_scripts(dist)
self.installed_projects[dist.key] = dist self.installed_projects[dist.key] = dist
log.info(self.installation_report(requirement, dist, *info)) 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: if not deps and not self.always_copy:
return return
elif requirement is not None and dist.key != requirement.key: elif requirement is not None and dist.key != requirement.key:
...@@ -509,10 +513,6 @@ Please make the appropriate changes for your system and try again. ...@@ -509,10 +513,6 @@ Please make the appropriate changes for your system and try again.
requirement = Requirement( requirement = Requirement(
distreq.project_name, distreq.specs, requirement.extras 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) log.info("Processing dependencies for %s", requirement)
try: try:
distros = WorkingSet([]).resolve( distros = WorkingSet([]).resolve(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment