X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=0ab0b732d48324c6fef38b3f834a1aa8bdf72a06;hb=e7a05948d115c258827ac6718f0d404c2782d80b;hp=a61f99de768ebe37bc43d9f94ea6a76319c80250;hpb=25a7e1c7eb3f36dad2e533eee73192b329d0dd67;p=dak.git diff --git a/dak/queue_report.py b/dak/queue_report.py index a61f99de..0ab0b732 100755 --- a/dak/queue_report.py +++ b/dak/queue_report.py @@ -45,6 +45,7 @@ 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.dak_exceptions import * @@ -373,6 +374,7 @@ RRA:MAX:0.5:288:795 def process_queue(queue, log, rrd_dir): msg = "" type = queue.queue_name + session = DBConn().session() # Divide the .changes into per-source groups per_source = {} @@ -381,6 +383,10 @@ def process_queue(queue, log, rrd_dir): if source not in per_source: per_source[source] = {} per_source[source]["list"] = [] + per_source[source]["processed"] = "" + handler = PolicyQueueUploadHandler(upload, session) + if handler.get_action(): + per_source[source]["processed"] = " | PENDING %s" % handler.get_action() per_source[source]["list"].append(upload) # Determine oldest time and have note status for each source group for source in per_source.keys(): @@ -481,7 +487,7 @@ def process_queue(queue, log, rrd_dir): note = " | [N]" else: note = "" - entries.append([source, binary, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, filename]) + entries.append([source, binary, version_list, arch_list, per_source[source]["processed"], note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, filename]) # direction entry consists of "Which field, which direction, time-consider" where # time-consider says how we should treat last_modified. Thats all. @@ -492,16 +498,16 @@ def process_queue(queue, log, rrd_dir): age = Cnf["Queue-Report::Options::Age"] if Cnf.has_key("Queue-Report::Options::New"): # If we produce html we always have oldest first. - direction.append([5,-1,"ao"]) + direction.append([6,-1,"ao"]) else: if Cnf.has_key("Queue-Report::Options::Sort"): for i in Cnf["Queue-Report::Options::Sort"].split(","): if i == "ao": # Age, oldest first. - direction.append([5,-1,age]) + direction.append([6,-1,age]) elif i == "an": # Age, newest first. - direction.append([5,1,age]) + direction.append([6,1,age]) elif i == "na": # Name, Ascending. direction.append([0,1,0]) @@ -510,10 +516,10 @@ def process_queue(queue, log, rrd_dir): direction.append([0,-1,0]) elif i == "nl": # Notes last. - direction.append([4,1,0]) + direction.append([5,1,0]) elif i == "nf": # Notes first. - direction.append([4,-1,0]) + direction.append([5,-1,0]) entries.sort(lambda x, y: sortfunc(x, y)) # Yes, in theory you can add several sort options at the commandline with. But my mind is to small # at the moment to come up with a real good sorting function that considers all the sidesteps you @@ -523,7 +529,7 @@ def process_queue(queue, log, rrd_dir): if Cnf.has_key("Queue-Report::Options::822"): # print stuff out in 822 format for entry in entries: - (source, binary, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, changes_file) = entry + (source, binary, version_list, arch_list, processed, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, changes_file) = entry # We'll always have Source, Version, Arch, Mantainer, and Dist # For the rest, check to see if we have them, then print them out @@ -560,24 +566,24 @@ def process_queue(queue, log, rrd_dir): source_count = len(per_source_items) if Cnf.has_key("Queue-Report::Options::New"): - direction.append([5,1,"ao"]) + direction.append([6,1,"ao"]) entries.sort(lambda x, y: sortfunc(x, y)) # Output for a html file. First table header. then table_footer. # Any line between them is then a printed from subroutine table_row. if len(entries) > 0: table_header(type.upper(), source_count, total_count) for entry in entries: - (source, binary, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, undef) = entry + (source, binary, version_list, arch_list, processed, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, undef) = entry table_row(source, version_list, arch_list, time_pp(last_modified), maint, distribution, closes, fingerprint, sponsor, changedby) 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\n" % (max_source_len, max_version_len, max_arch_len) + 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, note, last_modified, undef, undef, undef, undef, undef, undef, undef) = entry - msg += format % (source, version_list, arch_list, note, time_pp(last_modified)) + (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 msg: print type.upper()