diff options
| -rw-r--r-- | django/db/transaction.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/django/db/transaction.py b/django/db/transaction.py index 921affc2d8..f6cadfc84b 100644 --- a/django/db/transaction.py +++ b/django/db/transaction.py @@ -302,7 +302,13 @@ class Atomic(object): try: connection.savepoint_commit(sid) except DatabaseError: - connection.savepoint_rollback(sid) + 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 @@ -328,7 +334,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. |