X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=a4b997af90e17e26cf242057c3a658d33437e281;hb=88cdf52f57fe66c536cd326c28e60ff7f3e489d2;hp=8152bfa63e7e9c4cabe85754dc8a7aa1059bc334;hpb=a9e2e913b9dbca9a8a64ef2d78858b3e1c65a21b;p=dak.git diff --git a/dak/queue_report.py b/dak/queue_report.py index 8152bfa6..a4b997af 100755 --- a/dak/queue_report.py +++ b/dak/queue_report.py @@ -45,7 +45,9 @@ except ImportError: from daklib import utils 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 @@ -115,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"] @@ -173,7 +183,7 @@ def header():
- +