Commit 1bcc8eb0 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

[1.7.x] Increased robustness of 58161e4e. Refs #22291. 

Backport of ee837b9a from master
parent 2ad0bc13

django/db/transaction.py

+8 −2
Original line number Diff line number Diff line
@@ -325,7 +325,13 @@ class Atomic(object): 
                        try:

                            connection.savepoint_commit(sid)

                        except DatabaseError:

                            try:

                                connection.savepoint_rollback(sid)

                            except Error:

                                # If rolling back to a savepoint fails, mark for

                                # rollback at a higher level and avoid shadowing

                                # the original exception.

                                connection.needs_rollback = True

                            raise

                else:

                    # Commit transaction
@@ -351,7 +357,7 @@ class Atomic(object): 
                    else:

                        try:

                            connection.savepoint_rollback(sid)

                        except DatabaseError:

                        except Error:

                            # If rolling back to a savepoint fails, mark for

                            # rollback at a higher level and avoid shadowing

                            # the original exception.