summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-11-21 16:05:20 -0600
committerMichael Merickel <michael@merickel.org>2014-12-26 22:49:19 -0600
commitd643c10413d49d5ec9c2bc0d6dc2dc4fb08c99c9 (patch)
tree82d28cc1d889043e9c9c52e2ac45ff5754062cad
parenta1a5306b89bc652ad089551f0976a8b5f68d6b63 (diff)
downloadpyramid-d643c10413d49d5ec9c2bc0d6dc2dc4fb08c99c9.tar.gz
pyramid-d643c10413d49d5ec9c2bc0d6dc2dc4fb08c99c9.tar.bz2
pyramid-d643c10413d49d5ec9c2bc0d6dc2dc4fb08c99c9.zip
improve error output a bit
-rw-r--r--pyramid/config/__init__.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 1a9cc3f5a..0bd61bc39 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -1096,9 +1096,10 @@ class ActionState(object):
yield a
elif b is not None and a != b:
raise ConfigurationError(
- 'Re-entrant failure - attempted to resolve '
- 'actions in a different order from the active '
- 'execution path.')
+ 'During execution a re-entrant action was added '
+ 'that modified the planned execution order in a '
+ 'way that is incompatible with what has already '
+ 'been done.')
else:
# resolved action is in the same location as before,
# so we are in good shape, but the action is already