fix: transaction error in with statement

webpy · Dec 15, 2007 · a9df657 · a9df657
1 parent 247d501
commit a9df657
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/web/db.py b/web/db.py
@@ -362,11 +362,13 @@ class transaction:
     end.
     """
     def __enter__(self):
+        self.db_transaction = web.ctx.db_transaction
         transact()
 
     def __exit__(self, exctype, excvalue, traceback):
         if exctype is not None:
-            rollback()
+            while self.db_transaction < web.ctx.db_transaction:
+                rollback()
         else:
             commit()
 
@@ -400,7 +402,7 @@ def rollback(care=True):
     """Rolls back a transaction."""
     web.ctx.db_transaction -= 1     
     if web.ctx.db_transaction < 0:
-        web.db_transaction = 0
+        web.ctx.db_transaction = 0
         if care:
             raise TransactionError, "not in a transaction"
         else: