X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=10073931dcb88deab9eb92dc397abc5c51eac3b2;hb=3dcc42f4feed71441cb490cb83e23d4008113ac4;hp=4daa3ccbca5825878490bbecb2a0bfd02d26e833;hpb=1c35448b880358d020e81339657e3435fdda9434;p=dak.git

diff --git a/dak/queue_report.py b/dak/queue_report.py
index 4daa3ccb..10073931 100755
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -37,10 +37,10 @@
 from copy import copy
 import glob, os, stat, sys, time
 import apt_pkg
-import cgi
 
 from daklib import utils
-from daklib.dbconn import DBConn, has_new_comment
+from daklib.queue import Upload
+from daklib.dbconn import DBConn, has_new_comment, DBChange, get_uid_from_fingerprint
 from daklib.textutils import fix_maintainer
 from daklib.dak_exceptions import *
 
@@ -277,11 +277,12 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
     (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("@", 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
+    if sponsor:
+        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 Exception, e:
+            pass
 
     print "<span class=\"signature\">Fingerprint: %s</span>" % (fingerprint)
     print "</td>"
@@ -295,17 +296,19 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
 ############################################################
 
 def process_changes_files(changes_files, type, log):
+    session = DBConn().session()
     msg = ""
     cache = {}
     # 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():
@@ -357,9 +360,18 @@ def process_changes_files(changes_files, type, log):
         source = i[1]["list"][0]["source"]
         if len(source) > max_source_len:
             max_source_len = len(source)
+	binary_list = i[1]["list"][0]["binary"].keys()
+	binary = ', '.join(binary_list)
         arches = {}
         versions = {}
         for j in i[1]["list"]:
+            changesbase = os.path.basename(j["filename"])
+            try:
+                dbc = session.query(DBChange).filter_by(changesname=changesbase).one()
+            except Exception, e:
+                print "Can't find changes file in NEW for %s (%s)" % (changesbase, e)
+                dbc = None
+
             if Cnf.has_key("Queue-Report::Options::New") or Cnf.has_key("Queue-Report::Options::822"):
                 try:
                     (maintainer["maintainer822"], maintainer["maintainer2047"],
@@ -383,9 +395,14 @@ def process_changes_files(changes_files, type, log):
 
                 distribution=j["distribution"].keys()
                 closes=j["closes"].keys()
-                fingerprint=j["fingerprint"]
-                if j.has_key("sponsoremail"):
-                    sponsor=j["sponsoremail"]
+                if dbc:
+                    fingerprint = dbc.fingerprint
+                    sponsor_name = get_uid_from_fingerprint(fingerprint).name
+                    sponsor_email = get_uid_from_fingerprint(fingerprint).uid + "@debian.org"
+                    if sponsor_name != maintainer["maintainername"] and sponsor_name != changeby["changedbyname"] and \
+                    sponsor_email != maintainer["maintaineremail"] and sponsor_name != changeby["changedbyemail"]:
+                        sponsor = sponsor_email
+
             for arch in j["architecture"].keys():
                 arches[arch] = ""
             version = j["version"]
@@ -402,7 +419,7 @@ def process_changes_files(changes_files, type, log):
             note = " | [N]"
         else:
             note = ""
-        entries.append([source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, filename])
+        entries.append([source, binary, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, filename])
 
     # direction entry consists of "Which field, which direction, time-consider" where
     # time-consider says how we should treat last_modified. Thats all.
@@ -444,11 +461,12 @@ def process_changes_files(changes_files, type, log):
     if Cnf.has_key("Queue-Report::Options::822"):
         # print stuff out in 822 format
         for entry in entries:
-            (source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, changes_file) = entry
+            (source, binary, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, changes_file) = entry
 
             # We'll always have Source, Version, Arch, Mantainer, and Dist
             # For the rest, check to see if we have them, then print them out
             log.write("Source: " + source + "\n")
+            log.write("Binary: " + binary + "\n")
             log.write("Version: " + version_list + "\n")
             log.write("Architectures: ")
             log.write( (", ".join(arch_list.split(" "))) + "\n")