add wrapper routines

[dak.git] / dak / queue_report.py

diff --git a/dak/queue_report.py b/dak/queue_report.py
index cc59a9f8e2e695784acc6e03b4606d0633a86c58..a9f027ced5c780c286772dbfa3a27c7073a09e76 100755 (executable)
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -38,13 +38,16 @@ import copy, glob, os, stat, sys, time
 import apt_pkg
 import cgi
 from daklib import queue
+from daklib import database
 from daklib import utils
+from daklib.textutils import fix_maintainer
 from daklib.dak_exceptions import *
 
 Cnf = None
 Upload = None
 direction = []
 row_number = 0
+projectB = None
 
 ################################################################################
 
@@ -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 += (database.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"]) = \
@@ -531,6 +534,7 @@ def main():
         usage()
 
     Upload = queue.Upload(Cnf)
+    projectB = Upload.projectB
 
     if Cnf.has_key("Queue-Report::Options::New"):
         header()