X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=3a98df5837e55a33bb9956460d0e36533ddeaeab;hb=f1ab3b5950e10e5852c18dd4cfe6f7c6d12159db;hp=0ab0b732d48324c6fef38b3f834a1aa8bdf72a06;hpb=f9eebd69a1a73b5362477e3c16cfb83dd9388610;p=dak.git

diff --git a/dak/queue_report.py b/dak/queue_report.py
index 0ab0b732..3a98df58 100755
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -47,6 +47,7 @@ from daklib.dbconn import DBConn, DBSource, has_new_comment, PolicyQueue, \
                           get_uid_from_fingerprint
 from daklib.policy import PolicyQueueUploadHandler
 from daklib.textutils import fix_maintainer
+from daklib.utils import get_logins_from_ldap
 from daklib.dak_exceptions import *
 
 Cnf = None
@@ -318,11 +319,7 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
     print "<span class=\"changed-by\">Changed-By: <a href=\"http://qa.debian.org/developer.php?login=%s\">%s</a></span><br/>" % (utils.html_escape(mail), utils.html_escape(name))
 
     if sponsor:
-        try:
-            (login, domain) = sponsor.split("@", 1)
-            print "<span class=\"sponsor\">Sponsor: <a href=\"http://qa.debian.org/developer.php?login=%s\">%s</a>@debian.org</span><br/>" % (utils.html_escape(login), utils.html_escape(login))
-        except Exception as e:
-            pass
+        print "<span class=\"sponsor\">Sponsor: <a href=\"http://qa.debian.org/developer.php?login=%s\">%s</a>@debian.org</span><br/>" % (utils.html_escape(sponsor), utils.html_escape(sponsor))
 
     print "<span class=\"signature\">Fingerprint: %s</span>" % (fingerprint)
     print "</td>"
@@ -388,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"]
@@ -402,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
@@ -419,6 +417,10 @@ def process_queue(queue, log, rrd_dir):
     max_source_len = 0
     max_version_len = 0
     max_arch_len = 0
+    try:
+        logins = get_logins_from_ldap()
+    except:
+        logins = dict()
     for i in per_source_items:
         maintainer = {}
         maint=""
@@ -467,10 +469,15 @@ def process_queue(queue, log, rrd_dir):
 
                 fingerprint = dbc.fingerprint
                 sponsor_name = get_uid_from_fingerprint(fingerprint).name
-                sponsor_email = get_uid_from_fingerprint(fingerprint).uid + "@debian.org"
-                if sponsor_name != maintainer["maintainername"] and sponsor_name != changeby["changedbyname"] and \
-                        sponsor_email != maintainer["maintaineremail"] and sponsor_name != changeby["changedbyemail"]:
-                    sponsor = sponsor_email
+                sponsor_login = get_uid_from_fingerprint(fingerprint).uid
+                if '@' in sponsor_login:
+                    if fingerprint in logins:
+                        sponsor_login = logins[fingerprint]
+                if (sponsor_name != maintainer["maintainername"] and
+                  sponsor_name != changeby["changedbyname"] and
+                  sponsor_login + '@debian.org' != maintainer["maintaineremail"] and
+                  sponsor_name != changeby["changedbyemail"]):
+                    sponsor = sponsor_login
 
             for arch in dbc.architecture.split():
                 arches.add(arch)
@@ -478,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:
@@ -548,7 +555,7 @@ def process_queue(queue, log, rrd_dir):
                (name, mail) = changedby.split(":", 1)
                log.write("Changed-By: " + name + " <"+mail+">" + "\n")
             if sponsor:
-               log.write("Sponsored-By: " + "@".join(sponsor.split("@")[:2]) + "\n")
+               log.write("Sponsored-By: %s@debian.org\n" % sponsor)
             log.write("Distribution:")
             for dist in distribution:
                log.write(" " + dist)