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

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 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,