diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-10-11 19:34:56 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-10-11 19:34:56 -0400 |
| commit | def05795f3198b6cc1df6d65d81cf4341a75ca94 (patch) | |
| tree | 7df8ed1d7656c6f4f0a1d58d40d91aeb750328fd | |
| parent | b24eb9a8ca82e89e619bbd5b0d6c34fe3389238a (diff) | |
| parent | b8aa043f94b112b01115a52954610eeb46c492cb (diff) | |
| download | python-setuptools-bitbucket-def05795f3198b6cc1df6d65d81cf4341a75ca94.tar.gz | |
Merge VersionConflict test failure. Fixes #270.
| -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 de50c4b0..511068a6 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -628,7 +628,7 @@ class WorkingSet(object): if dist not in req: # Oops, the "best" so far conflicts with a dependency tmpl = "%s is installed but %s is required by %s" - args = dist, req, list(required_by.get(req)) + args = dist, req, list(required_by.get(req, [])) raise VersionConflict(tmpl % args) # push the new requirements onto the stack |