From 50554a5ce775023ccf58fe4aafccd7102534829d Mon Sep 17 00:00:00 2001 From: PJ Eby Date: Thu, 3 Nov 2005 03:52:06 +0000 Subject: Handle non-requirement installs correctly for dependency processing (e.g. "setup.py install", or "easy_install somefile/someurl"). --HG-- branch : setuptools extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041383 --- setuptools/command/easy_install.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setuptools/command/easy_install.py') diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index 852654e9..eb4952c0 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -379,10 +379,10 @@ class easy_install(Command): 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 ) -- cgit v1.2.3