X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=inline;f=dak%2Fqueue_report.py;h=422672b7e99be6c9fa466a1fd7b22336ba4132b9;hb=adedbaadd3fb7468c894ba94595950c41bb61050;hp=ec7b3a7d2fe55abbf089dcf65f0910f97ef3e1d5;hpb=eb53e8658fcc140e3b338162b5bce52447afc94e;p=dak.git diff --git a/dak/queue_report.py b/dak/queue_report.py index ec7b3a7d..422672b7 100755 --- a/dak/queue_report.py +++ b/dak/queue_report.py @@ -43,10 +43,11 @@ except ImportError: pass from daklib import utils -from daklib.queue import Upload -from daklib.dbconn import DBConn, has_new_comment, DBChange, DBSource, \ - get_uid_from_fingerprint, get_policy_queue +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 @@ -116,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"] @@ -174,11 +183,12 @@ def header():
- +