X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=inline;f=dak%2Fqueue_report.py;h=8e338e526181c9d5d16dd4737ae7b36e6dce725e;hb=e90a4dc285d19f8e498fdbd1d94967fa756d830d;hp=cc59a9f8e2e695784acc6e03b4606d0633a86c58;hpb=3dda7f70c2a25c6dcefb70ffc99e0d8231d09c27;p=dak.git
diff --git a/dak/queue_report.py b/dak/queue_report.py
index cc59a9f8..8e338e52 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.changes import Changes
+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
@@ -278,7 +280,8 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
try:
(login, domain) = sponsor.split("@", 1)
print "@debian.org
" % (utils.html_escape(login), utils.html_escape(login))
- except:
+ except Exception, e:
+ print "WARNING: Exception %s" % e
pass
print "Fingerprint: %s" % (fingerprint)
@@ -298,13 +301,13 @@ 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
+ except Exception, e:
+ print "WARNING: Exception %s" % e
+ continue
# Divide the .changes into per-source groups
per_source = {}
for filename in cache.keys():
@@ -327,7 +330,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 +366,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 +376,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"]) = \
@@ -511,7 +514,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 +533,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"):