summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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