X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fqueue_report.py;h=cc59a9f8e2e695784acc6e03b4606d0633a86c58;hb=cd5b29ddfd8de263c085f494b9573d683913f6f3;hp=dfd2861627dd467d7d16496f77d72e1e828d87ec;hpb=8645f7416c0245829268b993f362f73cacdd8b1c;p=dak.git

diff --git a/dak/queue_report.py b/dak/queue_report.py
index dfd28616..cc59a9f8 100755
--- 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
@@ -268,15 +268,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
@@ -351,6 +351,7 @@ def process_changes_files(changes_files, type, log):
         changeby = {}
         changedby=""
         sponsor=""
+        filename=i[1]["list"][0]["filename"]
         last_modified = time.time()-i[1]["oldest"]
         source = i[1]["list"][0]["source"]
         if len(source) > max_source_len:
@@ -400,7 +401,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, cache[filename]["filename"]])
+        entries.append([source, 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.
@@ -454,10 +455,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")
@@ -484,7 +485,7 @@ def process_changes_files(changes_files, type, log):
             source_count = len(per_source_items)
             table_header(type.upper(), source_count, total_count)
             for entry in entries:
-                (source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby) = entry
+                (source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, undef) = entry
                 table_row(source, version_list, arch_list, time_pp(last_modified), maint, distribution, closes, fingerprint, sponsor, changedby)
             table_footer(type.upper())
     elif not Cnf.has_key("Queue-Report::Options::822"):
@@ -493,7 +494,7 @@ def process_changes_files(changes_files, type, log):
 
         msg = ""
         for entry in entries:
-            (source, version_list, arch_list, note, last_modified, undef, undef, undef, undef, undef, undef) = entry
+            (source, version_list, arch_list, note, last_modified, undef, undef, undef, undef, undef, undef, undef) = entry
             msg += format % (source, version_list, arch_list, note, time_pp(last_modified))
 
         if msg: