merge stable
authorAlexandre Fayolle <alexandre.fayolle@logilab.fr>
Mon, 08 Feb 2010 15:28:34 +0100
branchstable
changeset 4505 a82af6b000f2
parent 4504 f1d505f979b3 (current diff)
parent 4503 f2b592b1d34c (diff)
child 4510 8dc44329f5c8
child 4514 5bb1d39ea0da
child 4524 2eb36514ad6d
merge
--- a/server/session.py	Mon Feb 08 15:28:18 2010 +0100
+++ b/server/session.py	Mon Feb 08 15:28:34 2010 +0100
@@ -475,7 +475,10 @@
                     for operation in processed:
                         operation.handle_event('revert%s_event' % trstate)
                     # res
-                    self.pending_operations[:] = processed + self.pending_operations
+
+                    # XXX self.pending_operations is supposed to be
+                    # read-only, and we are clearly modifying it here.
+                    self.pending_operations[:] = processed + self.pending_operations 
                     self.rollback(reset_pool)
                     raise
             self.pool.commit()