X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=inline;f=dak%2Fqueue_report.py;h=1bef3e55915bd9de7b1b43e04120a69ffe377190;hb=0e3744060f31777ea639a51e5c7251cf62c302c4;hp=8152bfa63e7e9c4cabe85754dc8a7aa1059bc334;hpb=a9e2e913b9dbca9a8a64ef2d78858b3e1c65a21b;p=dak.git
diff --git a/dak/queue_report.py b/dak/queue_report.py
index 8152bfa6..1bef3e55 100755
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -45,7 +45,9 @@ 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.utils import get_logins_from_ldap
from daklib.dak_exceptions import *
Cnf = None
@@ -186,7 +188,7 @@ def header():
continue;
c = children[i].getAttribute("class").split(" ");
for(var j = 0; j < c.length; j++) {
- if(c[j] == "binNEW") {
+ if(c[j] == "sourceNEW") {
if (children[i].style.display == '')
children[i].style.display = 'none';
else children[i].style.display = '';
@@ -244,12 +246,12 @@ def footer():
"""
def table_header(type, source_count, total_count):
- print "
Summary for: %s
" % (type)
- print "Summary for: binary-%s only
" % (type)
+ print "Summary for: %s
" % (type)
+ print "Summary for: binary-%s only
" % (type)
print """
Click to toggle all/binary-NEW packages
-
+
"""
print "Package count in %s: %s | Total Package count: %s" % (type, source_count, total_count)
print """
@@ -282,8 +284,12 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
if dist == "experimental":
trclass = "exp"
- if not len(session.query(DBSource).filter_by(source = source).all()):
- trclass += " binNEW"
+ query = '''SELECT source
+ FROM source_suite
+ WHERE source = :source
+ AND suite_name IN ('unstable', 'experimental')'''
+ if not session.execute(query, {'source': source}).rowcount:
+ trclass += " sourceNEW"
session.commit()
if row_number % 2 != 0:
@@ -291,7 +297,7 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
else:
print "" % (trclass)
- if "binNEW" in trclass:
+ if "sourceNEW" in trclass:
print "%s | " % (source)
else:
print "%(source)s | " % {'source': source}
@@ -313,11 +319,7 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
print "Changed-By: %s
" % (utils.html_escape(mail), utils.html_escape(name))
if sponsor:
- try:
- (login, domain) = sponsor.split("@", 1)
- print "
" % (utils.html_escape(login), utils.html_escape(login))
- except Exception as e:
- pass
+ print "
" % (utils.html_escape(sponsor), utils.html_escape(sponsor))
print "Fingerprint: %s" % (fingerprint)
print ""
@@ -369,6 +371,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 = {}
@@ -377,6 +380,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():
@@ -392,7 +399,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
@@ -409,6 +416,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=""
@@ -457,10 +468,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)
@@ -477,7 +493,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.
@@ -488,16 +504,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])
@@ -506,10 +522,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
@@ -519,7 +535,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
@@ -538,7 +554,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)
@@ -552,27 +568,28 @@ def process_queue(queue, log, rrd_dir):
log.write("Changes-File: " + os.path.basename(changes_file) + "\n")
log.write("\n")
+ total_count = len(queue.uploads)
+ source_count = len(per_source_items)
+
if Cnf.has_key("Queue-Report::Options::New"):
- total_count = len(queue.uploads)
- source_count = len(per_source_items)
- 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()