diff options
author | PJ Eby <distutils-sig@python.org> | 2008-01-15 17:46:13 +0000 |
---|---|---|
committer | PJ Eby <distutils-sig@python.org> | 2008-01-15 17:46:13 +0000 |
commit | 00e90f6a642ebd652a8912dad19b752714c051a5 (patch) | |
tree | 52d948ee57281ebf01a8faae9dca823492bc2cf3 /setuptools/command/easy_install.py | |
parent | 8e3c998ec1aeeb87094e75d4fdc86db0ae3a2e1e (diff) | |
download | external_python_setuptools-00e90f6a642ebd652a8912dad19b752714c051a5.tar.gz external_python_setuptools-00e90f6a642ebd652a8912dad19b752714c051a5.tar.bz2 external_python_setuptools-00e90f6a642ebd652a8912dad19b752714c051a5.zip |
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
Diffstat (limited to 'setuptools/command/easy_install.py')
-rwxr-xr-x | setuptools/command/easy_install.py | 8 |
1 files changed, 4 insertions, 4 deletions
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( |