Merge commit 'buxy/bugfixes' into merge

[dak.git] / dak / queue_report.py

diff --git a/dak/queue_report.py b/dak/queue_report.py
index 29d0788124082c672d84eebebca86670d2a8608d..a4bcea0fbda39303bd0bd37d3701b050f94379f4 100755 (executable)
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Produces a report on NEW and BYHAND packages
+""" Produces a report on NEW and BYHAND packages """
 # Copyright (C) 2001, 2002, 2003, 2005, 2006  James Troup <james@nocrew.org>
 
 # This program is free software; you can redistribute it and/or modify
@@ -38,6 +38,7 @@ 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.dak_exceptions import *
 
@@ -45,6 +46,7 @@ Cnf = None
 Upload = None
 direction = []
 row_number = 0
+projectB = None
 
 ################################################################################
 
@@ -268,15 +270,15 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
         print "%s<br/>" % (dist)
     print "</td>"
     print "<td class=\"age\">%s</td>" % (last_mod)
-    (name, mail) = maint.split(":")
+    (name, mail) = maint.split(":", 1)
 
     print "<td class=\"upload-data\">"
     print "<span class=\"maintainer\">Maintainer: <a href=\"http://qa.debian.org/developer.php?login=%s\">%s</a></span><br/>" % (utils.html_escape(mail), utils.html_escape(name))
-    (name, mail) = changedby.split(":")
+    (name, mail) = changedby.split(":", 1)
     print "<span class=\"changed-by\">Changed-By: <a href=\"http://qa.debian.org/developer.php?login=%s\">%s</a></span><br/>" % (utils.html_escape(mail), utils.html_escape(name))
 
     try:
-        (login, domain) = sponsor.split("@")
+        (login, domain) = sponsor.split("@", 1)
         print "<span class=\"sponsor\">Sponsor: <a href=\"http://qa.debian.org/developer.php?login=%s\">%s</a></span>@debian.org<br/>" % (utils.html_escape(login), utils.html_escape(login))
     except:
         pass
@@ -327,7 +329,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
@@ -455,10 +457,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")
@@ -531,6 +533,7 @@ def main():
         usage()
 
     Upload = queue.Upload(Cnf)
+    projectB = Upload.projectB
 
     if Cnf.has_key("Queue-Report::Options::New"):
         header()