X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=5e164285d8372599d8537bc922f644a77a99393c;hb=c8182c171aa569945e899566fdf6492cfb166d71;hp=cb2b93904a974d5800be5b2a0e6689cecd27b198;hpb=3262ca150aab7bd3f0616432f7e187a2d11b7a0c;p=dak.git diff --git a/dak/queue_report.py b/dak/queue_report.py index cb2b9390..5e164285 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():
- +Hint: Age is the youngest upload of the package, if there is more than
one version.
- You may want to look at the REJECT-FAQ
+ You may want to look at the REJECT-FAQ
for possible reasons why one of the above packages may get rejected.
%s | " % (source) else: print "%(source)s | " % {'source': source} @@ -312,18 +327,14 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing print "Changed-By: %s"
for close in closes:
- print "#%s " % (utils.html_escape(close), utils.html_escape(close)) + print "#%s " % (utils.html_escape(close), utils.html_escape(close)) print " |