aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2020-02-09 22:40:04 +0100
committerSebastian Pipping <sping@gentoo.org>2020-02-10 00:16:35 +0100
commit778c8f4d3c4663457b180a6c7cee2e6d85fd135e (patch)
treee58cc80ef0536f59c0aa87d4e58c0f36c509343e
parentsetup.py: drop south, update minimum django version (diff)
downloadeuscan-778c8f4d3c4663457b180a6c7cee2e6d85fd135e.tar.gz
euscan-778c8f4d3c4663457b180a6c7cee2e6d85fd135e.tar.bz2
euscan-778c8f4d3c4663457b180a6c7cee2e6d85fd135e.zip
Stop using django.db.transaction.commit_on_success for Django >=1.8
Signed-off-by: Sebastian Pipping <sping@gentoo.org>
-rw-r--r--euscanwww/djeuscan/processing/misc/update_counters.py4
-rw-r--r--euscanwww/djeuscan/processing/scan/scan_metadata.py4
-rw-r--r--euscanwww/djeuscan/processing/scan/scan_portage.py4
-rw-r--r--euscanwww/djeuscan/processing/scan/scan_upstream.py4
4 files changed, 8 insertions, 8 deletions
diff --git a/euscanwww/djeuscan/processing/misc/update_counters.py b/euscanwww/djeuscan/processing/misc/update_counters.py
index 392b7b5..3abc6a2 100644
--- a/euscanwww/djeuscan/processing/misc/update_counters.py
+++ b/euscanwww/djeuscan/processing/misc/update_counters.py
@@ -1,4 +1,4 @@
-from django.db.transaction import commit_on_success
+from django.db.transaction import atomic
from django.utils import timezone
from djeuscan.models import Package, Herd, Maintainer, Version, HerdLog, \
@@ -36,7 +36,7 @@ def _add_last_ver(storage, version):
storage[key] = version
-@commit_on_success
+@atomic
def update_counters(fast=False, nolog=False, logger=None):
logger = logger or FakeLogger()
diff --git a/euscanwww/djeuscan/processing/scan/scan_metadata.py b/euscanwww/djeuscan/processing/scan/scan_metadata.py
index 22bad3f..16474f5 100644
--- a/euscanwww/djeuscan/processing/scan/scan_metadata.py
+++ b/euscanwww/djeuscan/processing/scan/scan_metadata.py
@@ -5,7 +5,7 @@ from gentoolkit.metadata import MetaData
import xml.etree.cElementTree as etree
-from django.db.transaction import commit_on_success
+from django.db.transaction import atomic
from django.core.management.color import color_style
from django.core.exceptions import ValidationError
@@ -236,7 +236,7 @@ class ScanMetadata(object):
herd.maintainers.add(maintainer)
-@commit_on_success
+@atomic
def scan_metadata(packages=None, category=None, logger=None, populate=False):
scan_handler = ScanMetadata(logger=logger)
diff --git a/euscanwww/djeuscan/processing/scan/scan_portage.py b/euscanwww/djeuscan/processing/scan/scan_portage.py
index 857fce2..44abc2c 100644
--- a/euscanwww/djeuscan/processing/scan/scan_portage.py
+++ b/euscanwww/djeuscan/processing/scan/scan_portage.py
@@ -11,7 +11,7 @@ from layman import Layman
from xml.etree.ElementTree import iterparse, ParseError
-from django.db.transaction import commit_on_success
+from django.db.transaction import atomic
from django.db import models
from django.core.management.color import color_style
from django.conf import settings
@@ -395,7 +395,7 @@ def populate_overlays(logger):
logger.info("+ [o] %s", overlay)
-@commit_on_success
+@atomic
def scan_portage(packages=None, category=None, no_log=False, upstream=False,
purge_packages=False, purge_versions=False, logger=None):
diff --git a/euscanwww/djeuscan/processing/scan/scan_upstream.py b/euscanwww/djeuscan/processing/scan/scan_upstream.py
index dc7ba1b..2686202 100644
--- a/euscanwww/djeuscan/processing/scan/scan_upstream.py
+++ b/euscanwww/djeuscan/processing/scan/scan_upstream.py
@@ -1,7 +1,7 @@
import portage
from django.utils import timezone
-from django.db.transaction import commit_on_success
+from django.db.transaction import atomic
from euscan import CONFIG, output
from euscan.scan import scan_upstream as euscan_scan_upstream
@@ -150,7 +150,7 @@ class ScanUpstream(object):
version.delete()
-@commit_on_success
+@atomic
def scan_upstream(packages=None, purge_versions=False,
logger=None):
logger = logger or FakeLogger()