diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-11-28 19:55:53 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-11-28 19:55:53 -0500 |
commit | b2b6c78e3179cef66cd4e9dcea7f9003f409ce8b (patch) | |
tree | 2355b55efce971b6c7044b1f04b4a3730d2da50f /packages/views | |
parent | 0877f0389f187cf2cbf026c73b27071857d3e6f7 (diff) | |
parent | fab8d437929fce202b11707e1cacbc079f61edbc (diff) |
Merge tag 'release_2013-11-25' into archweb-generic
Django 1.6 upgrade and other changes
Conflicts:
templates/news/list.html
templates/public/index.html
Diffstat (limited to 'packages/views')
-rw-r--r-- | packages/views/flag.py | 2 | ||||
-rw-r--r-- | packages/views/signoff.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/views/flag.py b/packages/views/flag.py index 69ca3c9f..5680683a 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, |