queue-report: sort changes correctly (Closes: #704231)

[dak.git] / dak / queue_report.py

diff --git a/dak/queue_report.py b/dak/queue_report.py
index a2079e81c10c869f301f5d0edc558ef6145d382e..3a98df5837e55a33bb9956460d0e36533ddeaeab 100755 (executable)
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -385,6 +385,7 @@ def process_queue(queue, log, rrd_dir):
             if handler.get_action():
                 per_source[source]["processed"] = " | PENDING %s" % handler.get_action()
         per_source[source]["list"].append(upload)
+        per_source[source]["list"].sort(lambda x, y: cmp(x.changes.created, y.changes.created), reverse=True)
     # Determine oldest time and have note status for each source group
     for source in per_source.keys():
         source_list = per_source[source]["list"]
@@ -399,7 +400,7 @@ def process_queue(queue, log, rrd_dir):
             else:
                 if mtime < oldest:
                     oldest = mtime
-            have_note += has_new_comment(d.changes.source, d.changes.version)
+            have_note += has_new_comment(d.policy_queue, d.changes.source, d.changes.version)
         per_source[source]["oldest"] = oldest
         if not have_note:
             per_source[source]["note_state"] = 0; # none
@@ -416,7 +417,10 @@ def process_queue(queue, log, rrd_dir):
     max_source_len = 0
     max_version_len = 0
     max_arch_len = 0
-    logins = get_logins_from_ldap()
+    try:
+        logins = get_logins_from_ldap()
+    except:
+        logins = dict()
     for i in per_source_items:
         maintainer = {}
         maint=""
@@ -481,7 +485,7 @@ def process_queue(queue, log, rrd_dir):
         arches_list = list(arches)
         arches_list.sort(utils.arch_compare_sw)
         arch_list = " ".join(arches_list)
-        version_list = " ".join(versions)
+        version_list = " ".join(sorted(versions, reverse=True))
         if len(version_list) > max_version_len:
             max_version_len = len(version_list)
         if len(arch_list) > max_arch_len: