Ticket #17624: django-bug-17624.patch

django/db/transaction.py

@@ -204 +204 @@
         self.entering(self.using)
 
     def __exit__(self, exc_type, exc_value, traceback):
-        self.exiting(exc_value, self.using)
+        success = exc_type is None and exc_value is None and traceback is None
+        self.exiting(success, self.using)
 
     def __call__(self, func):
         @wraps(func)
@@ -254 +255 @@
         enter_transaction_management(managed=False, using=using)
         managed(False, using=using)
 
-    def exiting(exc_value, using):
+    def exiting(success, using):
         leave_transaction_management(using=using)
 
     return _transaction_func(entering, exiting, using)
@@ -270 +271 @@
         enter_transaction_management(using=using)
         managed(True, using=using)
 
-    def exiting(exc_value, using):
+    def exiting(success, using):
         try:
-            if exc_value is not None:
+            if not success:
                 if is_dirty(using=using):
                     rollback(using=using)
             else:
@@ -298 +299 @@
         enter_transaction_management(using=using)
         managed(True, using=using)
 
-    def exiting(exc_value, using):
+    def exiting(success, using):
         leave_transaction_management(using=using)
 
     return _transaction_func(entering, exiting, using)