auto-decruft: Disable short options for NVI

[dak.git] / dak / queue_report.py

diff --git a/dak/queue_report.py b/dak/queue_report.py
index a7086d897a68c54ffc4232bc429c616eb72465e6..a4b997af90e17e26cf242057c3a658d33437e281 100755 (executable)
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -300,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))
@@ -314,12 +314,12 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
     (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))
+    print "<span class=\"maintainer\">Maintainer: <a href=\"https://qa.debian.org/developer.php?login=%s\">%s</a></span><br/>" % (utils.html_escape(mail), utils.html_escape(name))
     (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))
+    print "<span class=\"changed-by\">Changed-By: <a href=\"https://qa.debian.org/developer.php?login=%s\">%s</a></span><br/>" % (utils.html_escape(mail), utils.html_escape(name))
 
     if sponsor:
-        print "<span class=\"sponsor\">Sponsor: <a href=\"http://qa.debian.org/developer.php?login=%s\">%s</a>@debian.org</span><br/>" % (utils.html_escape(sponsor), utils.html_escape(sponsor))
+        print "<span class=\"sponsor\">Sponsor: <a href=\"https://qa.debian.org/developer.php?login=%s\">%s</a>@debian.org</span><br/>" % (utils.html_escape(sponsor), utils.html_escape(sponsor))
 
     print "<span class=\"signature\">Fingerprint: %s</span>" % (fingerprint)
     print "</td>"
@@ -654,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()