X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=a4b997af90e17e26cf242057c3a658d33437e281;hb=c9ca62268c8358315ba45818291c9b0fdc475a2d;hp=a8f741026155e955a56b9876d1eafa9a3652fd26;hpb=c94ba7558e6768b5b42191ba49fade0916d10a58;p=dak.git diff --git a/dak/queue_report.py b/dak/queue_report.py index a8f74102..a4b997af 100755 --- a/dak/queue_report.py +++ b/dak/queue_report.py @@ -47,7 +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_login_from_ldap +from daklib.utils import get_logins_from_ldap from daklib.dak_exceptions import * Cnf = None @@ -117,7 +117,15 @@ def time_pp(x): def sg_compare (a, b): a = a[1] b = b[1] - """Sort by have note, time of oldest upload.""" + """Sort by have pending action, have note, time of oldest upload.""" + # Sort by have pending action + a_note_state = a["processed"] + b_note_state = b["processed"] + if a_note_state < b_note_state: + return -1 + elif a_note_state > b_note_state: + return 1 + # Sort by have note a_note_state = a["note_state"] b_note_state = b["note_state"] @@ -175,7 +183,7 @@ def header():
- +