[Python-checkins] commit of r41383 - sandbox/trunk/setuptools/setuptools/command

[phillip.eby@python.org]

Author: phillip.eby
Date: Thu Nov  3 04:52:06 2005
New Revision: 41383

Modified:
   sandbox/trunk/setuptools/setuptools/command/easy_install.py
Log:
Handle non-requirement installs correctly for dependency processing
(e.g. "setup.py install", or "easy_install somefile/someurl").


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	Thu Nov  3 04:52:06 2005
@@ -379,10 +379,10 @@
         elif requirement is not None and dist.key != requirement.key:
             log.warn("Skipping dependencies for %s", dist)
             return  # XXX this is not the distribution we were looking for
-
-        if requirement is None or dist not in requirement:
+        elif requirement is None or dist not in requirement:
             # if we wound up with a different version, resolve what we've got
             distreq = dist.as_requirement()
+            requirement = requirement or distreq
             requirement = Requirement(
                 distreq.project_name, distreq.specs, requirement.extras
             )