X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=dak%2Fqueue_report.py;h=84f6a22f23946139349199b27afa46f3597a7f52;hb=c073afafa7a6b21834a0acee195fd517a0b5ae97;hp=4daa3ccbca5825878490bbecb2a0bfd02d26e833;hpb=1c35448b880358d020e81339657e3435fdda9434;p=dak.git
diff --git a/dak/queue_report.py b/dak/queue_report.py
index 4daa3ccb..84f6a22f 100755
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -37,10 +37,10 @@
from copy import copy
import glob, os, stat, sys, time
import apt_pkg
-import cgi
from daklib import utils
-from daklib.dbconn import DBConn, has_new_comment
+from daklib.queue import Upload
+from daklib.dbconn import DBConn, has_new_comment, DBChange, DBSource, get_uid_from_fingerprint
from daklib.textutils import fix_maintainer
from daklib.dak_exceptions import *
@@ -172,6 +172,23 @@ def header():
Debian NEW and BYHAND Packages
+
@@ -219,10 +236,12 @@ def footer():
"""
def table_header(type, source_count, total_count):
- print "
Summary for: %s
" % (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 """
@@ -250,10 +269,15 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
global row_number
trclass = "sid"
+ session = DBConn().session()
for dist in distribution:
if dist == "experimental":
trclass = "exp"
+ if not len(session.query(DBSource).filter_by(source = source).all()):
+ trclass += " binNEW"
+ session.commit()
+
if row_number % 2 != 0:
print "" % (trclass)
else:
@@ -277,11 +301,12 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
(name, mail) = changedby.split(":", 1)
print "Changed-By: %s
" % (utils.html_escape(mail), utils.html_escape(name))
- try:
- (login, domain) = sponsor.split("@", 1)
- print "@debian.org
" % (utils.html_escape(login), utils.html_escape(login))
- except:
- pass
+ if sponsor:
+ try:
+ (login, domain) = sponsor.split("@", 1)
+ print "@debian.org
" % (utils.html_escape(login), utils.html_escape(login))
+ except Exception, e:
+ pass
print "Fingerprint: %s" % (fingerprint)
print ""
@@ -295,17 +320,19 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
############################################################
def process_changes_files(changes_files, type, log):
+ session = DBConn().session()
msg = ""
cache = {}
# Read in all the .changes files
for filename in changes_files:
try:
- c = Changes()
- c.load_dot_dak(filename)
- cache[filename] = copy(c.changes)
+ u = Upload()
+ u.load_changes(filename)
+ cache[filename] = copy(u.pkg.changes)
cache[filename]["filename"] = filename
- except:
- break
+ except Exception, e:
+ print "WARNING: Exception %s" % e
+ continue
# Divide the .changes into per-source groups
per_source = {}
for filename in cache.keys():
@@ -357,9 +384,18 @@ def process_changes_files(changes_files, type, log):
source = i[1]["list"][0]["source"]
if len(source) > max_source_len:
max_source_len = len(source)
+ binary_list = i[1]["list"][0]["binary"].keys()
+ binary = ', '.join(binary_list)
arches = {}
versions = {}
for j in i[1]["list"]:
+ changesbase = os.path.basename(j["filename"])
+ try:
+ dbc = session.query(DBChange).filter_by(changesname=changesbase).one()
+ except Exception, e:
+ print "Can't find changes file in NEW for %s (%s)" % (changesbase, e)
+ dbc = None
+
if Cnf.has_key("Queue-Report::Options::New") or Cnf.has_key("Queue-Report::Options::822"):
try:
(maintainer["maintainer822"], maintainer["maintainer2047"],
@@ -383,9 +419,14 @@ def process_changes_files(changes_files, type, log):
distribution=j["distribution"].keys()
closes=j["closes"].keys()
- fingerprint=j["fingerprint"]
- if j.has_key("sponsoremail"):
- sponsor=j["sponsoremail"]
+ if dbc:
+ 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
+
for arch in j["architecture"].keys():
arches[arch] = ""
version = j["version"]
@@ -402,7 +443,7 @@ def process_changes_files(changes_files, type, log):
note = " | [N]"
else:
note = ""
- entries.append([source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, filename])
+ entries.append([source, binary, version_list, arch_list, 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.
@@ -413,16 +454,16 @@ def process_changes_files(changes_files, type, log):
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([4,-1,"ao"])
+ direction.append([5,-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([4,-1,age])
+ direction.append([5,-1,age])
elif i == "an":
# Age, newest first.
- direction.append([4,1,age])
+ direction.append([5,1,age])
elif i == "na":
# Name, Ascending.
direction.append([0,1,0])
@@ -431,10 +472,10 @@ def process_changes_files(changes_files, type, log):
direction.append([0,-1,0])
elif i == "nl":
# Notes last.
- direction.append([3,1,0])
+ direction.append([4,1,0])
elif i == "nf":
# Notes first.
- direction.append([3,-1,0])
+ direction.append([4,-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
@@ -444,11 +485,12 @@ def process_changes_files(changes_files, type, log):
if Cnf.has_key("Queue-Report::Options::822"):
# print stuff out in 822 format
for entry in entries:
- (source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, changes_file) = entry
+ (source, binary, version_list, arch_list, 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
log.write("Source: " + source + "\n")
+ log.write("Binary: " + binary + "\n")
log.write("Version: " + version_list + "\n")
log.write("Architectures: ")
log.write( (", ".join(arch_list.split(" "))) + "\n")
@@ -477,7 +519,7 @@ def process_changes_files(changes_files, type, log):
log.write("\n")
if Cnf.has_key("Queue-Report::Options::New"):
- direction.append([4,1,"ao"])
+ direction.append([5,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.
@@ -486,7 +528,7 @@ def process_changes_files(changes_files, type, log):
source_count = len(per_source_items)
table_header(type.upper(), source_count, total_count)
for entry in entries:
- (source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, undef) = entry
+ (source, binary, version_list, arch_list, 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"):
@@ -495,7 +537,7 @@ def process_changes_files(changes_files, type, log):
msg = ""
for entry in entries:
- (source, version_list, arch_list, note, last_modified, undef, undef, undef, undef, undef, undef, undef) = entry
+ (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))
if msg: