queue-report: use tracker.debian.org instead of packages.qa.d.o

[dak.git] / dak / queue_report.py

diff --git a/dak/queue_report.py b/dak/queue_report.py
index 5e164285d8372599d8537bc922f644a77a99393c..d2c8d790081590956031973712673b3b1342e5f4 100755 (executable)
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -242,14 +242,6 @@ def footer():
     one version.<br />
     You may want to look at <a href="https://ftp-master.debian.org/REJECT-FAQ.html">the REJECT-FAQ</a>
       for possible reasons why one of the above packages may get rejected.</p>
-      <p>
-      <a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10"
-        alt="Valid XHTML 1.0 Strict" height="31" width="88" /></a>
-      <a href="http://jigsaw.w3.org/css-validator/">
-        <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss"
-        alt="Valid CSS!" />
-      </a>
-      </p>
     </div> </body> </html>
     """
 
@@ -308,7 +300,7 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
     if "sourceNEW" 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=\"package\"><a href=\"https://tracker.debian.org/pkg/%(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))
@@ -662,7 +654,10 @@ def main():
     f = None
     if Cnf.has_key("Queue-Report::Options::822"):
         # Open the report file
-        f = open(Cnf["Queue-Report::ReportLocations::822Location"], "w")
+        f = sys.stdout
+        filename822 = Cnf.get("Queue-Report::ReportLocations::822Location")
+        if filename822:
+            f = open(filename822, "w")
 
     session = DBConn().session()