summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2013-11-25 21:10:25 -0600
committerDan McGee <dan@archlinux.org>2013-11-25 21:10:25 -0600
commit108cfaa8df3b94031a3436fbb71c76fdc0650ba1 (patch)
tree61c30085b49e63c6605dfebac3bef5e123cbaa70 /packages
parent06317908f73420224fce0c400048c3b7dcfc8abb (diff)
parent071bd6bd71f681c45048fc0a0961e58d43d44d48 (diff)
Merge branch 'django-1.6'
Diffstat (limited to 'packages')
-rw-r--r--packages/admin.py4
-rw-r--r--packages/views/flag.py2
-rw-r--r--packages/views/signoff.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/packages/admin.py b/packages/admin.py
index 820bbb29..4680c755 100644
--- a/packages/admin.py
+++ b/packages/admin.py
@@ -20,7 +20,7 @@ class FlagRequestAdmin(admin.ModelAdmin):
ordering = ('-created',)
date_hierarchy = 'created'
- def queryset(self, request):
+ def get_queryset(self, request):
qs = super(FlagRequestAdmin, self).queryset(request)
return qs.select_related('repo', 'user')
@@ -42,7 +42,7 @@ class SignoffSpecificationAdmin(admin.ModelAdmin):
ordering = ('-created',)
date_hierarchy = 'created'
- def queryset(self, request):
+ def get_queryset(self, request):
qs = super(SignoffSpecificationAdmin, self).queryset(request)
return qs.select_related('arch', 'repo', 'user')
diff --git a/packages/views/flag.py b/packages/views/flag.py
index 39cdcef8..9fe60e2c 100644
--- a/packages/views/flag.py
+++ b/packages/views/flag.py
@@ -84,7 +84,7 @@ def flag(request, name, repo, arch):
else:
email = form.cleaned_data['email']
- @transaction.commit_on_success
+ @transaction.atomic
def perform_updates():
current_time = now()
pkgs.update(flag_date=current_time)
diff --git a/packages/views/signoff.py b/packages/views/signoff.py
index c37aa0fc..fcc6de45 100644
--- a/packages/views/signoff.py
+++ b/packages/views/signoff.py
@@ -81,7 +81,7 @@ class SignoffOptionsForm(forms.ModelForm):
def _signoff_options_all(request, name, repo):
seen_ids = set()
- with transaction.commit_on_success():
+ with transaction.atomic():
# find or create a specification for all architectures, then
# graft the form data onto them
packages = Package.objects.filter(pkgbase=name,