diff options
| -rwxr-xr-x | EasyInstall.txt | 2 | ||||
| -rwxr-xr-x | setuptools/command/easy_install.py | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/EasyInstall.txt b/EasyInstall.txt index dc119674..2f6665f2 100755 --- a/EasyInstall.txt +++ b/EasyInstall.txt @@ -1239,6 +1239,8 @@ Release Notes/Change History * 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. diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index 0bebe698..d0ce190e 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -497,6 +497,10 @@ Please make the appropriate changes for your system and try again. 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 @@ Please make the appropriate changes for your system and try again. 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( |