Commit e83d7d41 authored by Jason R. Coombs's avatar Jason R. Coombs

Extract variables

parent 9e8c9329
...@@ -626,9 +626,9 @@ class WorkingSet(object): ...@@ -626,9 +626,9 @@ class WorkingSet(object):
to_activate.append(dist) to_activate.append(dist)
if dist not in req: if dist not in req:
# Oops, the "best" so far conflicts with a dependency # Oops, the "best" so far conflicts with a dependency
raise VersionConflict( tmpl = "%s is installed but %s is required by %s"
"%s is installed but %s is required by %s" args = dist, req, list(required_by.get(req))
% (dist, req, list(required_by.get(req)))) raise VersionConflict(tmpl % args)
new_requirements = dist.requires(req.extras)[::-1] new_requirements = dist.requires(req.extras)[::-1]
requirements.extend(new_requirements) requirements.extend(new_requirements)
for new_requirement in new_requirements: for new_requirement in new_requirements:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment