Only flag PubBeforeAbort and PubBeforeAbort as retry when the event w…

…ill actually be retried. (#502)

See plone/buildout.coredev#564

src/ZPublisher/WSGIPublisher.py

@@ -160,13 +160,15 @@ def transaction_pubevents(request, response, tm=transaction.manager):
                 response._unauthorized()
                 response.setStatus(exc.getStatus())
 
-            notify(pubevents.PubBeforeAbort(
-                request, exc_info, request.supports_retry()))
+            retry = False
+            if isinstance(exc, TransientError) and request.supports_retry():
+                retry = True
+
+            notify(pubevents.PubBeforeAbort(request, exc_info, retry))
             tm.abort()
-            notify(pubevents.PubFailure(
-                request, exc_info, request.supports_retry()))
+            notify(pubevents.PubFailure(request, exc_info, retry))
 
-            if isinstance(exc, TransientError) and request.supports_retry():
+            if retry:
                 reraise(*exc_info)
 
             if not (exc_view_created or isinstance(exc, Unauthorized)):