Merge branch 'merge'

[dak.git] / dak / queue_report.py

diff --git a/dak/queue_report.py b/dak/queue_report.py
index 29d0788124082c672d84eebebca86670d2a8608d..8e338e526181c9d5d16dd4737ae7b36e6dce725e 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
@@ -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
 
@@ -268,17 +270,18 @@ 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:
+    except Exception, e:
+        print "WARNING: Exception %s" % e
         pass
 
     print "<span class=\"signature\">Fingerprint: %s</span>" % (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"]) = \
@@ -455,10 +458,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 +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"):