diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-10-11 13:01:01 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-10-11 13:01:01 -0400 |
| commit | 86f0d48001e56b5bb244a56f1147f9d52748c14d (patch) | |
| tree | 17b3c5c27908b35f8a6e2aa5603f4ffd9a509876 | |
| parent | 2131f9153005c982c7ff7efbff05cbcd8dba4f66 (diff) | |
| download | python-setuptools-bitbucket-86f0d48001e56b5bb244a56f1147f9d52748c14d.tar.gz | |
Extract variables
| -rw-r--r-- | pkg_resources.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg_resources.py b/pkg_resources.py index 35e2ed24..ac72d71f 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -626,9 +626,9 @@ class WorkingSet(object): to_activate.append(dist) if dist not in req: # Oops, the "best" so far conflicts with a dependency - raise VersionConflict( - "%s is installed but %s is required by %s" - % (dist, req, list(required_by.get(req)))) + tmpl = "%s is installed but %s is required by %s" + args = dist, req, list(required_by.get(req)) + raise VersionConflict(tmpl % args) new_requirements = dist.requires(req.extras)[::-1] requirements.extend(new_requirements) for new_requirement in new_requirements: |