- forward ported r105590 from 2.12 branch

src/ZPublisher/Publish.py

@@ -173,12 +173,11 @@ def publish(request, module_name, after_list, debug=0,
                                         )
                     retry = True
             finally:
-                
                 # Note: 'abort's can fail. Nevertheless, we want end request handling
                 try:
-                    
+                    try:
                         notify(PubBeforeAbort(request, exc_info, retry))
-                    
+                    finally:
                         if transactions_manager:
                             transactions_manager.abort()
                 finally:
@@ -200,9 +199,9 @@ def publish(request, module_name, after_list, debug=0,
         else:
             # Note: 'abort's can fail. Nevertheless, we want end request handling
             try:
-                
+                try:
                     notify(PubBeforeAbort(request, exc_info, False))
-                
+                finally:
                     if transactions_manager:
                         transactions_manager.abort()
             finally:
@@ -210,7 +209,6 @@ def publish(request, module_name, after_list, debug=0,
                 notify(PubFailure(request, exc_info, False))
             raise
 
-
 def publish_module_standard(module_name,
                    stdin=sys.stdin, stdout=sys.stdout, stderr=sys.stderr,
                    environ=os.environ, debug=0, request=None, response=None):