X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=c9013a5239c956eb54c5c60e9ed656ca6aa9fe2d;hb=c751cc0207f16dcda54926c45bc9b5ae286e648c;hp=a4bcea0fbda39303bd0bd37d3701b050f94379f4;hpb=1d800d8d6b8bcdd246ab9da3b33d9e13b38b13d7;p=dak.git
diff --git a/dak/queue_report.py b/dak/queue_report.py
index a4bcea0f..c9013a52 100755
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -34,19 +34,19 @@
################################################################################
-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 database
+
from daklib import utils
+from daklib.queue import Upload
+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
-projectB = None
################################################################################
@@ -280,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)
@@ -300,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)
+ 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():
@@ -329,7 +330,7 @@ def process_changes_files(changes_files, type, log):
else:
if mtime < oldest:
oldest = mtime
- have_note += (database.has_new_comment(d["source"], d["version"]))
+ 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
@@ -365,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"
@@ -375,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"]) = \
@@ -513,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"),
@@ -532,12 +533,12 @@ def main():
if Options["Help"]:
usage()
- Upload = queue.Upload(Cnf)
- projectB = Upload.projectB
-
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"):