Merge commit 'mhy/master' into merge

[dak.git] / dak / queue_report.py

diff --git a/dak/queue_report.py b/dak/queue_report.py
index 4daa3ccbca5825878490bbecb2a0bfd02d26e833..c9013a5239c956eb54c5c60e9ed656ca6aa9fe2d 100755 (executable)
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -37,9 +37,9 @@
 from copy import copy
 import glob, os, stat, sys, time
 import apt_pkg
-import cgi
 
 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 *
@@ -280,7 +280,8 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
     try:
         (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)
@@ -300,12 +301,13 @@ def process_changes_files(changes_files, type, log):
     # Read in all the .changes files
     for filename in changes_files:
         try:
-            c = Changes()
-            c.load_dot_dak(filename)
-            cache[filename] = copy(c.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():