Merge tag 'release_2015-04-13' into archweb-generic

Fix up 'None' display in places

1 files changed, 3 insertions, 1 deletions

diff --git a/todolists/views.py b/todolists/views.py
index db6f20f0..a0b56e25 100644
--- a/todolists/views.py
+++ b/todolists/views.py
@@ -1,4 +1,5 @@
 import json
+from operator import attrgetter
 
 from django import forms
 from django.http import HttpResponse
@@ -224,8 +225,9 @@ def send_todolist_emails(todo_list, new_packages):
                 maint_packages.setdefault(maint, []).append(todo_package)
 
     for maint, packages in maint_packages.iteritems():
+        packages = sorted(packages, key=attrgetter('pkgname', 'arch'))
         ctx = Context({
-            'todo_packages': sorted(packages),
+            'todo_packages': packages,
             'todolist': todo_list,
         })
         template = loader.get_template('todolists/email_notification.txt')