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 | 75767f62ffcc886e29f2759fe56f4861ca3f8559 (patch) | |
| tree | ac8f776e6a57d2a2edba2290f6cc3e2472ff90fa | |
| parent | f110f30df540d21c4fe7870460c07d70c6c8cd0b (diff) | |
| parent | e3e55681150f7bd389d8c3e8ce99d18e743cdb2b (diff) | |
| download | external_python_setuptools-75767f62ffcc886e29f2759fe56f4861ca3f8559.tar.gz external_python_setuptools-75767f62ffcc886e29f2759fe56f4861ca3f8559.tar.bz2 external_python_setuptools-75767f62ffcc886e29f2759fe56f4861ca3f8559.zip | |
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 |