X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=422672b7e99be6c9fa466a1fd7b22336ba4132b9;hb=905d361b3e8c03fe4b0ece18f856bbf7a1e2eec5;hp=3a98df5837e55a33bb9956460d0e36533ddeaeab;hpb=fed896b01d7248f42a2218844da6da180bd33e38;p=dak.git diff --git a/dak/queue_report.py b/dak/queue_report.py index 3a98df58..422672b7 100755 --- a/dak/queue_report.py +++ b/dak/queue_report.py @@ -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(): - + Debian NEW and BYHAND Packages @@ -201,22 +209,22 @@ def header():
- corner image - corner image - corner image - corner image Debian NEW and BYHAND Packages @@ -232,16 +240,8 @@ def footer():

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.

-

- Valid XHTML 1.0 Strict - - Valid CSS! - -

""" @@ -326,7 +326,7 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing print "" 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 "" row_number+=1 @@ -375,6 +375,7 @@ def process_queue(queue, log, rrd_dir): # Divide the .changes into per-source groups per_source = {} + total_pending = 0 for upload in queue.uploads: source = upload.changes.source if source not in per_source: @@ -383,7 +384,8 @@ def process_queue(queue, log, rrd_dir): per_source[source]["processed"] = "" handler = PolicyQueueUploadHandler(upload, session) if handler.get_action(): - per_source[source]["processed"] = " | PENDING %s" % handler.get_action() + per_source[source]["processed"] = "PENDING %s" % handler.get_action() + total_pending += 1 per_source[source]["list"].append(upload) per_source[source]["list"].sort(lambda x, y: cmp(x.changes.created, y.changes.created), reverse=True) # Determine oldest time and have note status for each source group @@ -585,19 +587,25 @@ def process_queue(queue, log, rrd_dir): table_footer(type.upper()) elif not Cnf.has_key("Queue-Report::Options::822"): # The "normal" output without any formatting. - format="%%-%ds | %%-%ds | %%-%ds%%s | %%s old%%s\n" % (max_source_len, max_version_len, max_arch_len) - msg = "" for entry in entries: (source, binary, version_list, arch_list, processed, note, last_modified, undef, undef, undef, undef, undef, undef, undef) = entry - msg += format % (source, version_list, arch_list, note, time_pp(last_modified), processed) + if processed: + format="%%-%ds | %%-%ds | %%-%ds | %%s\n" % (max_source_len, max_version_len, max_arch_len) + msg += format % (source, version_list, arch_list, processed) + else: + format="%%-%ds | %%-%ds | %%-%ds%%s | %%s old\n" % (max_source_len, max_version_len, max_arch_len) + msg += format % (source, version_list, arch_list, note, time_pp(last_modified)) if msg: print type.upper() print "-"*len(type) print print msg - print "%s %s source package%s / %s %s package%s in total." % (source_count, type, plural(source_count), total_count, type, plural(total_count)) + print ("%s %s source package%s / %s %s package%s in total / %s %s package%s to be processed." % + (source_count, type, plural(source_count), + total_count, type, plural(total_count), + total_pending, type, plural(total_pending))) print ################################################################################ @@ -646,7 +654,10 @@ def main(): f = None if Cnf.has_key("Queue-Report::Options::822"): # Open the report file - f = open(Cnf["Queue-Report::ReportLocations::822Location"], "w") + f = sys.stdout + filename822 = Cnf.get("Queue-Report::ReportLocations::822Location") + if filename822: + f = open(filename822, "w") session = DBConn().session()