summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
diff options
context:
space:
mode:
authorSimon Ruderich <simon@ruderich.org>2013-11-11 21:36:50 +0100
committerSol Jerome <sol.jerome@gmail.com>2013-11-11 22:19:56 -0600
commitb7479fa7dc6d87135fb328dbf9ba4bcd81a5db53 (patch)
treece1dc6702ad457b06a818baf08d916bdc9190de3 /src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
parent103b1b5198828876fa0684296900769018075f1b (diff)
downloadbcfg2-b7479fa7dc6d87135fb328dbf9ba4bcd81a5db53.tar.gz
bcfg2-b7479fa7dc6d87135fb328dbf9ba4bcd81a5db53.tar.bz2
bcfg2-b7479fa7dc6d87135fb328dbf9ba4bcd81a5db53.zip
Fix compatibility with Django 1.6.
Diffstat (limited to 'src/lib/Bcfg2/Reporting/Storage/DjangoORM.py')
-rw-r--r--src/lib/Bcfg2/Reporting/Storage/DjangoORM.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
index aea5e9d4b..ef1e92103 100644
--- a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
+++ b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
@@ -18,12 +18,12 @@ from django.core import management
from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
from django.db.models import FieldDoesNotExist
from django.core.cache import cache
-from django.db import transaction
#Used by GetCurrentEntry
import difflib
from Bcfg2.Compat import b64decode
from Bcfg2.Reporting.models import *
+from Bcfg2.Reporting.Compat import transaction
class DjangoORM(StorageBase):
@@ -256,7 +256,7 @@ class DjangoORM(StorageBase):
entry.tag)
return None
- @transaction.commit_on_success
+ @transaction.atomic
def _import_interaction(self, interaction):
"""Real import function"""
hostname = interaction['hostname']