Merge remote-tracking branch 'ansgar/pu/postgresql-9.1' into merge

[dak.git] / dak / queue_report.py

diff --git a/dak/queue_report.py b/dak/queue_report.py
index cb5c05eda0813632553274876fc64601a70b287a..cb2b93904a974d5800be5b2a0e6689cecd27b198 100755 (executable)
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -44,7 +44,8 @@ except ImportError:
 
 from daklib import utils
 from daklib.queue import Upload
-from daklib.dbconn import DBConn, has_new_comment, DBChange, DBSource, get_uid_from_fingerprint
+from daklib.dbconn import DBConn, has_new_comment, DBChange, DBSource, \
+                          get_uid_from_fingerprint, get_policy_queue
 from daklib.textutils import fix_maintainer
 from daklib.dak_exceptions import *
 
@@ -289,7 +290,10 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
     else:
         print "<tr class=\"%s odd\">" % (trclass)
 
-    print "<td class=\"package\">%s</td>" % (source)
+    if "binNEW" in trclass:
+        print "<td class=\"package\">%s</td>" % (source)
+    else:
+        print "<td class=\"package\"><a href=\"http://packages.qa.debian.org/%(source)s\">%(source)s</a></td>" % {'source': source}
     print "<td class=\"version\">"
     for vers in version.split():
         print "<a href=\"new/%s_%s.html\">%s</a><br/>" % (source, utils.html_escape(vers), utils.html_escape(vers))
@@ -311,7 +315,7 @@ 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 Exception, e:
+        except Exception as e:
             pass
 
     print "<span class=\"signature\">Fingerprint: %s</span>" % (fingerprint)
@@ -354,7 +358,7 @@ RRA:MAX:0.5:288:795
         try:
             rc = rrdtool.create(*create)
             ru = rrdtool.update(*update)
-        except rrdtool.error, e:
+        except rrdtool.error as e:
             print('warning: queue_report: rrdtool error, skipping %s.rrd: %s' % (type, e))
     except NameError:
         pass
@@ -371,7 +375,7 @@ def process_changes_files(changes_files, type, log, rrd_dir):
             u.load_changes(filename)
             cache[filename] = copy(u.pkg.changes)
             cache[filename]["filename"] = filename
-        except Exception, e:
+        except Exception as e:
             print "WARNING: Exception %s" % e
             continue
     # Divide the .changes into per-source groups
@@ -437,7 +441,7 @@ def process_changes_files(changes_files, type, log, rrd_dir):
                 session = DBConn().session()
                 dbc = session.query(DBChange).filter_by(changesname=changesbase).one()
                 session.close()
-            except Exception, e:
+            except Exception as e:
                 print "Can't find changes file in NEW for %s (%s)" % (changesbase, e)
                 dbc = None
 
@@ -446,7 +450,7 @@ def process_changes_files(changes_files, type, log, rrd_dir):
                     (maintainer["maintainer822"], maintainer["maintainer2047"],
                     maintainer["maintainername"], maintainer["maintaineremail"]) = \
                     fix_maintainer (j["maintainer"])
-                except ParseMaintError, msg:
+                except ParseMaintError as msg:
                     print "Problems while parsing maintainer address\n"
                     maintainer["maintainername"] = "Unknown"
                     maintainer["maintaineremail"] = "Unknown"
@@ -456,7 +460,7 @@ def process_changes_files(changes_files, type, log, rrd_dir):
                     (changeby["changedby822"], changeby["changedby2047"],
                      changeby["changedbyname"], changeby["changedbyemail"]) = \
                      fix_maintainer (j["changed-by"])
-                except ParseMaintError, msg:
+                except ParseMaintError as msg:
                     (changeby["changedby822"], changeby["changedby2047"],
                      changeby["changedbyname"], changeby["changedbyemail"]) = \
                      ("", "", "", "")
@@ -549,7 +553,7 @@ def process_changes_files(changes_files, type, log, rrd_dir):
                (name, mail) = changedby.split(":", 1)
                log.write("Changed-By: " + name + " <"+mail+">" + "\n")
             if sponsor:
-               log.write("Sponsored-By: " + sponsor + "\n")
+               log.write("Sponsored-By: " + "@".join(sponsor.split("@")[:2]) + "\n")
             log.write("Distribution:")
             for dist in distribution:
                log.write(" " + dist)
@@ -654,7 +658,7 @@ def main():
         if queue:
             directory = os.path.abspath(queue.path)
             changes_files = glob.glob("%s/*.changes" % (directory))
-            process_changes_files(changes_files, directory, f, rrd_dir)
+            process_changes_files(changes_files, os.path.basename(directory), f, rrd_dir)
         else:
             utils.warn("Cannot find queue %s" % queue_name)