X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=4daa3ccbca5825878490bbecb2a0bfd02d26e833;hb=31dfbc42ec29fc91d23a4ea360792ac80f8ae417;hp=fe8a4a1b2ffab54bfda37ef7759ff8a2a464982c;hpb=0d80b258098ff470433efa4d9c1f81b404883195;p=dak.git
diff --git a/dak/queue_report.py b/dak/queue_report.py
index fe8a4a1b..4daa3ccb 100755
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -34,15 +34,17 @@
################################################################################
-import copy, glob, os, stat, sys, time
+from copy import copy
+import glob, os, stat, sys, time
import apt_pkg
import cgi
-from daklib import queue
+
from daklib import utils
+from daklib.dbconn import DBConn, has_new_comment
+from daklib.textutils import fix_maintainer
from daklib.dak_exceptions import *
Cnf = None
-Upload = None
direction = []
row_number = 0
@@ -268,15 +270,15 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
print "%s
" % (dist)
print ""
print "
%s | " % (last_mod)
- (name, mail) = maint.split(":")
+ (name, mail) = maint.split(":", 1)
print ""
print "Maintainer: %s " % (utils.html_escape(mail), utils.html_escape(name))
- (name, mail) = changedby.split(":")
+ (name, mail) = changedby.split(":", 1)
print "Changed-By: %s " % (utils.html_escape(mail), utils.html_escape(name))
try:
- (login, domain) = sponsor.split("@")
+ (login, domain) = sponsor.split("@", 1)
print "@debian.org " % (utils.html_escape(login), utils.html_escape(login))
except:
pass
@@ -298,10 +300,9 @@ def process_changes_files(changes_files, type, log):
# Read in all the .changes files
for filename in changes_files:
try:
- Upload.pkg.changes_file = filename
- Upload.init_vars()
- Upload.update_vars()
- cache[filename] = copy.copy(Upload.pkg.changes)
+ c = Changes()
+ c.load_dot_dak(filename)
+ cache[filename] = copy(c.changes)
cache[filename]["filename"] = filename
except:
break
@@ -327,7 +328,7 @@ def process_changes_files(changes_files, type, log):
else:
if mtime < oldest:
oldest = mtime
- have_note += (d.has_key("process-new note"))
+ have_note += has_new_comment(d["source"], d["version"])
per_source[source]["oldest"] = oldest
if not have_note:
per_source[source]["note_state"] = 0; # none
@@ -363,7 +364,7 @@ def process_changes_files(changes_files, type, log):
try:
(maintainer["maintainer822"], maintainer["maintainer2047"],
maintainer["maintainername"], maintainer["maintaineremail"]) = \
- utils.fix_maintainer (j["maintainer"])
+ fix_maintainer (j["maintainer"])
except ParseMaintError, msg:
print "Problems while parsing maintainer address\n"
maintainer["maintainername"] = "Unknown"
@@ -373,7 +374,7 @@ def process_changes_files(changes_files, type, log):
try:
(changeby["changedby822"], changeby["changedby2047"],
changeby["changedbyname"], changeby["changedbyemail"]) = \
- utils.fix_maintainer (j["changed-by"])
+ fix_maintainer (j["changed-by"])
except ParseMaintError, msg:
(changeby["changedby822"], changeby["changedby2047"],
changeby["changedbyname"], changeby["changedbyemail"]) = \
@@ -455,10 +456,10 @@ def process_changes_files(changes_files, type, log):
log.write("Last-Modified: " + str(int(time.time()) - int(last_modified)) + "\n")
log.write("Queue: " + type + "\n")
- (name, mail) = maint.split(":")
+ (name, mail) = maint.split(":", 1)
log.write("Maintainer: " + name + " <"+mail+">" + "\n")
if changedby:
- (name, mail) = changedby.split(":")
+ (name, mail) = changedby.split(":", 1)
log.write("Changed-By: " + name + " <"+mail+">" + "\n")
if sponsor:
log.write("Sponsored-By: " + sponsor + "\n")
@@ -511,7 +512,7 @@ def process_changes_files(changes_files, type, log):
################################################################################
def main():
- global Cnf, Upload
+ global Cnf
Cnf = utils.get_conf()
Arguments = [('h',"help","Queue-Report::Options::Help"),
@@ -530,11 +531,12 @@ def main():
if Options["Help"]:
usage()
- Upload = queue.Upload(Cnf)
-
if Cnf.has_key("Queue-Report::Options::New"):
header()
+ # Initialize db so we can get the NEW comments
+ dbconn = DBConn()
+
directories = [ ]
if Cnf.has_key("Queue-Report::Options::Directories"):
|