| 1 |
commit: 778c8f4d3c4663457b180a6c7cee2e6d85fd135e |
| 2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 9 21:40:04 2020 +0000 |
| 4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 23:16:35 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/euscan.git/commit/?id=778c8f4d |
| 7 |
|
| 8 |
Stop using django.db.transaction.commit_on_success for Django >=1.8 |
| 9 |
|
| 10 |
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> |
| 11 |
|
| 12 |
euscanwww/djeuscan/processing/misc/update_counters.py | 4 ++-- |
| 13 |
euscanwww/djeuscan/processing/scan/scan_metadata.py | 4 ++-- |
| 14 |
euscanwww/djeuscan/processing/scan/scan_portage.py | 4 ++-- |
| 15 |
euscanwww/djeuscan/processing/scan/scan_upstream.py | 4 ++-- |
| 16 |
4 files changed, 8 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/euscanwww/djeuscan/processing/misc/update_counters.py b/euscanwww/djeuscan/processing/misc/update_counters.py |
| 19 |
index 392b7b5..3abc6a2 100644 |
| 20 |
--- a/euscanwww/djeuscan/processing/misc/update_counters.py |
| 21 |
+++ b/euscanwww/djeuscan/processing/misc/update_counters.py |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-from django.db.transaction import commit_on_success |
| 24 |
+from django.db.transaction import atomic |
| 25 |
from django.utils import timezone |
| 26 |
|
| 27 |
from djeuscan.models import Package, Herd, Maintainer, Version, HerdLog, \ |
| 28 |
@@ -36,7 +36,7 @@ def _add_last_ver(storage, version): |
| 29 |
storage[key] = version |
| 30 |
|
| 31 |
|
| 32 |
-@commit_on_success |
| 33 |
+@atomic |
| 34 |
def update_counters(fast=False, nolog=False, logger=None): |
| 35 |
logger = logger or FakeLogger() |
| 36 |
|
| 37 |
|
| 38 |
diff --git a/euscanwww/djeuscan/processing/scan/scan_metadata.py b/euscanwww/djeuscan/processing/scan/scan_metadata.py |
| 39 |
index 22bad3f..16474f5 100644 |
| 40 |
--- a/euscanwww/djeuscan/processing/scan/scan_metadata.py |
| 41 |
+++ b/euscanwww/djeuscan/processing/scan/scan_metadata.py |
| 42 |
@@ -5,7 +5,7 @@ from gentoolkit.metadata import MetaData |
| 43 |
|
| 44 |
import xml.etree.cElementTree as etree |
| 45 |
|
| 46 |
-from django.db.transaction import commit_on_success |
| 47 |
+from django.db.transaction import atomic |
| 48 |
from django.core.management.color import color_style |
| 49 |
from django.core.exceptions import ValidationError |
| 50 |
|
| 51 |
@@ -236,7 +236,7 @@ class ScanMetadata(object): |
| 52 |
herd.maintainers.add(maintainer) |
| 53 |
|
| 54 |
|
| 55 |
-@commit_on_success |
| 56 |
+@atomic |
| 57 |
def scan_metadata(packages=None, category=None, logger=None, populate=False): |
| 58 |
scan_handler = ScanMetadata(logger=logger) |
| 59 |
|
| 60 |
|
| 61 |
diff --git a/euscanwww/djeuscan/processing/scan/scan_portage.py b/euscanwww/djeuscan/processing/scan/scan_portage.py |
| 62 |
index 857fce2..44abc2c 100644 |
| 63 |
--- a/euscanwww/djeuscan/processing/scan/scan_portage.py |
| 64 |
+++ b/euscanwww/djeuscan/processing/scan/scan_portage.py |
| 65 |
@@ -11,7 +11,7 @@ from layman import Layman |
| 66 |
|
| 67 |
from xml.etree.ElementTree import iterparse, ParseError |
| 68 |
|
| 69 |
-from django.db.transaction import commit_on_success |
| 70 |
+from django.db.transaction import atomic |
| 71 |
from django.db import models |
| 72 |
from django.core.management.color import color_style |
| 73 |
from django.conf import settings |
| 74 |
@@ -395,7 +395,7 @@ def populate_overlays(logger): |
| 75 |
logger.info("+ [o] %s", overlay) |
| 76 |
|
| 77 |
|
| 78 |
-@commit_on_success |
| 79 |
+@atomic |
| 80 |
def scan_portage(packages=None, category=None, no_log=False, upstream=False, |
| 81 |
purge_packages=False, purge_versions=False, logger=None): |
| 82 |
|
| 83 |
|
| 84 |
diff --git a/euscanwww/djeuscan/processing/scan/scan_upstream.py b/euscanwww/djeuscan/processing/scan/scan_upstream.py |
| 85 |
index dc7ba1b..2686202 100644 |
| 86 |
--- a/euscanwww/djeuscan/processing/scan/scan_upstream.py |
| 87 |
+++ b/euscanwww/djeuscan/processing/scan/scan_upstream.py |
| 88 |
@@ -1,7 +1,7 @@ |
| 89 |
import portage |
| 90 |
|
| 91 |
from django.utils import timezone |
| 92 |
-from django.db.transaction import commit_on_success |
| 93 |
+from django.db.transaction import atomic |
| 94 |
|
| 95 |
from euscan import CONFIG, output |
| 96 |
from euscan.scan import scan_upstream as euscan_scan_upstream |
| 97 |
@@ -150,7 +150,7 @@ class ScanUpstream(object): |
| 98 |
version.delete() |
| 99 |
|
| 100 |
|
| 101 |
-@commit_on_success |
| 102 |
+@atomic |
| 103 |
def scan_upstream(packages=None, purge_versions=False, |
| 104 |
logger=None): |
| 105 |
logger = logger or FakeLogger() |
Archives