X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=blobdiff_plain;f=dak%2Fqueue_report.py;h=a4b997af90e17e26cf242057c3a658d33437e281;hp=0ab0b732d48324c6fef38b3f834a1aa8bdf72a06;hb=519c1dbf89c13557afc15a429164616ac563d379;hpb=e7a05948d115c258827ac6718f0d404c2782d80b diff --git a/dak/queue_report.py b/dak/queue_report.py index 0ab0b732..a4b997af 100755 --- a/dak/queue_report.py +++ b/dak/queue_report.py @@ -47,6 +47,7 @@ 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,7 +183,7 @@ def header(): - + Debian NEW and BYHAND Packages @@ -200,22 +209,22 @@ def header():
- corner image - corner image - corner image - corner image Debian NEW and BYHAND Packages @@ -231,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! - -

""" @@ -299,7 +300,7 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing if "sourceNEW" in trclass: print "%s" % (source) else: - print "%(source)s" % {'source': source} + print "%(source)s" % {'source': source} print "" for vers in version.split(): print "%s
" % (source, utils.html_escape(vers), utils.html_escape(vers)) @@ -313,23 +314,19 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing (name, mail) = maint.split(":", 1) print "" - print "Maintainer: %s
" % (utils.html_escape(mail), utils.html_escape(name)) + print "Maintainer: %s
" % (utils.html_escape(mail), utils.html_escape(name)) (name, mail) = changedby.split(":", 1) - print "Changed-By: %s
" % (utils.html_escape(mail), utils.html_escape(name)) + print "Changed-By: %s
" % (utils.html_escape(mail), utils.html_escape(name)) if sponsor: - try: - (login, domain) = sponsor.split("@", 1) - print "Sponsor: %s@debian.org
" % (utils.html_escape(login), utils.html_escape(login)) - except Exception as e: - pass + print "Sponsor: %s@debian.org
" % (utils.html_escape(sponsor), utils.html_escape(sponsor)) print "Fingerprint: %s" % (fingerprint) print "" 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 @@ -378,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: @@ -386,8 +384,10 @@ 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 for source in per_source.keys(): source_list = per_source[source]["list"] @@ -402,7 +402,7 @@ def process_queue(queue, log, rrd_dir): else: if mtime < oldest: oldest = mtime - have_note += has_new_comment(d.changes.source, d.changes.version) + have_note += has_new_comment(d.policy_queue, d.changes.source, d.changes.version) per_source[source]["oldest"] = oldest if not have_note: per_source[source]["note_state"] = 0; # none @@ -419,6 +419,10 @@ def process_queue(queue, log, rrd_dir): max_source_len = 0 max_version_len = 0 max_arch_len = 0 + try: + logins = get_logins_from_ldap() + except: + logins = dict() for i in per_source_items: maintainer = {} maint="" @@ -467,10 +471,15 @@ def process_queue(queue, log, rrd_dir): fingerprint = dbc.fingerprint sponsor_name = get_uid_from_fingerprint(fingerprint).name - sponsor_email = get_uid_from_fingerprint(fingerprint).uid + "@debian.org" - if sponsor_name != maintainer["maintainername"] and sponsor_name != changeby["changedbyname"] and \ - sponsor_email != maintainer["maintaineremail"] and sponsor_name != changeby["changedbyemail"]: - sponsor = sponsor_email + sponsor_login = get_uid_from_fingerprint(fingerprint).uid + if '@' in sponsor_login: + if fingerprint in logins: + sponsor_login = logins[fingerprint] + if (sponsor_name != maintainer["maintainername"] and + sponsor_name != changeby["changedbyname"] and + sponsor_login + '@debian.org' != maintainer["maintaineremail"] and + sponsor_name != changeby["changedbyemail"]): + sponsor = sponsor_login for arch in dbc.architecture.split(): arches.add(arch) @@ -478,7 +487,7 @@ def process_queue(queue, log, rrd_dir): arches_list = list(arches) arches_list.sort(utils.arch_compare_sw) arch_list = " ".join(arches_list) - version_list = " ".join(versions) + version_list = " ".join(sorted(versions, reverse=True)) if len(version_list) > max_version_len: max_version_len = len(version_list) if len(arch_list) > max_arch_len: @@ -548,7 +557,7 @@ def process_queue(queue, log, rrd_dir): (name, mail) = changedby.split(":", 1) log.write("Changed-By: " + name + " <"+mail+">" + "\n") if sponsor: - log.write("Sponsored-By: " + "@".join(sponsor.split("@")[:2]) + "\n") + log.write("Sponsored-By: %s@debian.org\n" % sponsor) log.write("Distribution:") for dist in distribution: log.write(" " + dist) @@ -578,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 ################################################################################ @@ -639,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()