[Python-checkins] r59980 - sandbox/trunk/setuptools/setuptools/command/easy_install.py

[phillip.eby]

Author: phillip.eby
Date: Tue Jan 15 18:44:17 2008
New Revision: 59980

Modified:
   sandbox/trunk/setuptools/setuptools/command/easy_install.py
Log:
Fix not picking up dependency links from recursive dependencies.


Modified: sandbox/trunk/setuptools/setuptools/command/easy_install.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/command/easy_install.py	(original)
+++ sandbox/trunk/setuptools/setuptools/command/easy_install.py	Tue Jan 15 18:44:17 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(