diff options
| author | PJ Eby <distutils-sig@python.org> | 2005-11-03 03:52:06 +0000 |
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2005-11-03 03:52:06 +0000 |
| commit | 50554a5ce775023ccf58fe4aafccd7102534829d (patch) | |
| tree | 64332e4114384b4f8adcacc260f26b900d52b8fb | |
| parent | d675527eae964f3b69d5867f4df8800d10767d5c (diff) | |
| download | external_python_setuptools-50554a5ce775023ccf58fe4aafccd7102534829d.tar.gz external_python_setuptools-50554a5ce775023ccf58fe4aafccd7102534829d.tar.bz2 external_python_setuptools-50554a5ce775023ccf58fe4aafccd7102534829d.zip | |
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
| -rwxr-xr-x | setuptools/command/easy_install.py | 4 |
1 files changed, 2 insertions, 2 deletions
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 ) |