diff options
| author | PJ Eby <distutils-sig@python.org> | 2005-11-03 02:24:49 +0000 |
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2005-11-03 02:24:49 +0000 |
| commit | 4242a32e194db4930bc6ba1b355d75ad14ad9f0e (patch) | |
| tree | ada249e5b1736e79cd80c75fbc8e46d6626359e6 /pkg_resources.py | |
| parent | f2b5c33c782f6eeb4098b5091d586438221e975b (diff) | |
| download | python-setuptools-git-4242a32e194db4930bc6ba1b355d75ad14ad9f0e.tar.gz | |
Fixed a problem with ``WorkingSet.resolve()`` that prevented version
conflicts from being detected at runtime. (As reported by Ian Bicking.)
--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041380
Diffstat (limited to 'pkg_resources.py')
| -rw-r--r-- | pkg_resources.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg_resources.py b/pkg_resources.py index e03e104d..d2398cad 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -482,7 +482,7 @@ class WorkingSet(object): if dist is None: raise DistributionNotFound(req) # XXX put more info here to_activate.append(dist) - elif dist not in req: + if dist not in req: # Oops, the "best" so far conflicts with a dependency raise VersionConflict(dist,req) # XXX put more info here requirements.extend(dist.requires(req.extras)[::-1]) |