summaryrefslogtreecommitdiff
path: root/pkg_resources.py
diff options
context:
space:
mode:
authortarek <none@none>2009-12-12 15:02:19 +0100
committertarek <none@none>2009-12-12 15:02:19 +0100
commite07754742050fe498d758fca8578da9babbc483a (patch)
treeb2cf9016713912a4764533e6467eb8be8c48e6cb /pkg_resources.py
parent14a94e3f8ca9cee5d74253689baf0cefc03b767f (diff)
downloadpython-setuptools-git-e07754742050fe498d758fca8578da9babbc483a.tar.gz
fixed the error message used in DistributionNotFound, otherwise it breaks zc.buildout
--HG-- branch : distribute extra : rebase_source : fbcd6099522983770243735997694c3da40cd59f
Diffstat (limited to 'pkg_resources.py')
-rw-r--r--pkg_resources.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/pkg_resources.py b/pkg_resources.py
index 9f1baca4..3660a2a5 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -537,9 +537,13 @@ class WorkingSet(object):
env = Environment(self.entries)
dist = best[req.key] = env.best_match(req, self, installer)
if dist is None:
- msg = ("The '%s' distribution was not found on this "
- "system, and is required by this application.")
- raise DistributionNotFound(msg % req)
+ #msg = ("The '%s' distribution was not found on this "
+ # "system, and is required by this application.")
+ #raise DistributionNotFound(msg % req)
+
+ # unfortunately, zc.buildout uses a str(err)
+ # to get the name of the distribution here..
+ raise DistributionNotFound(req)
to_activate.append(dist)
if dist not in req:
# Oops, the "best" so far conflicts with a dependency