From a9282168f5952cfb5c7008c603aed78aaff142b2 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Thu, 11 Feb 2010 13:10:52 +0000 Subject: [PATCH] [1.1.X] Fixed #12189 -- Corrected rollback behavior in database cache backend. Thanks to Lakin Wecker for the report. Backport of r12409 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12413 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/cache/backends/db.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/core/cache/backends/db.py b/django/core/cache/backends/db.py index eb459a076d..1853db097f 100644 --- a/django/core/cache/backends/db.py +++ b/django/core/cache/backends/db.py @@ -65,7 +65,7 @@ class CacheClass(BaseCache): cursor.execute("INSERT INTO %s (cache_key, value, expires) VALUES (%%s, %%s, %%s)" % self._table, [key, encoded, str(exp)]) except DatabaseError: # To be threadsafe, updates/inserts are allowed to fail silently - transaction.rollback() + transaction.rollback_unless_managed() return False else: transaction.commit_unless_managed()