summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Admin/Reports.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/Server/Admin/Reports.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/Server/Admin/Reports.py')
-rw-r--r--src/lib/Bcfg2/Server/Admin/Reports.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Admin/Reports.py b/src/lib/Bcfg2/Server/Admin/Reports.py
index 849df8025..eb97123f7 100644
--- a/src/lib/Bcfg2/Server/Admin/Reports.py
+++ b/src/lib/Bcfg2/Server/Admin/Reports.py
@@ -19,11 +19,11 @@ sys.path.pop()
# Set DJANGO_SETTINGS_MODULE appropriately.
os.environ['DJANGO_SETTINGS_MODULE'] = '%s.settings' % project_name
-from django.db import transaction
from Bcfg2.Reporting.models import Client, Interaction, \
Performance, Bundle, Group, FailureEntry, PathEntry, \
PackageEntry, ServiceEntry, ActionEntry
+from Bcfg2.Reporting.Compat import transaction
def printStats(fn):
@@ -136,7 +136,7 @@ class Reports(Bcfg2.Server.Admin.Mode):
else:
self.errExit("Unknown command: %s" % args[0])
- @transaction.commit_on_success
+ @transaction.atomic
def scrub(self):
''' Perform a thorough scrub and cleanup of the database '''