X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=422672b7e99be6c9fa466a1fd7b22336ba4132b9;hb=47cd096281f1cc36dfe9818ef1fbae8d02f6ada6;hp=1f688919df9bf37f56ef8e637e96aae38ad8ba89;hpb=8cb1abe7c2f08bc22fd3ddfcfce55e6183cd297e;p=dak.git diff --git a/dak/queue_report.py b/dak/queue_report.py index 1f688919..422672b7 100755 --- a/dak/queue_report.py +++ b/dak/queue_report.py @@ -43,9 +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 +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 @@ -56,7 +58,7 @@ row_number = 0 def usage(exit_code=0): print """Usage: dak queue-report -Prints a report of packages in queue directories (usually new and byhand). +Prints a report of packages in queues (usually new and byhand). -h, --help show this help and exit. -8, --822 writes 822 formated output to the location set in dak.conf @@ -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,11 +183,12 @@ def header():
- +