Merge remote-tracking branch 'dktrkranz/fixes'

[dak.git] / dak / show_deferred.py

diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index a76fd389ea8ef484feba22ff99ef35c1c5356291..809762264532ab4f47517d49e02f3f3e77af4024 100755 (executable)
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -87,12 +87,6 @@ def header():
 def footer():
     res = "<p class=\"validate\">Timestamp: %s (UTC)</p>" % (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
     res += "<p class=\"timestamp\">There are <a href=\"/stat.html\">graphs about the queues</a> available.</p>"
-    res += """<a href="http://validator.w3.org/check?uri=referer">
-    <img border="0" src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" height="31" width="88"></a>
-        <a href="http://jigsaw.w3.org/css-validator/check/referer">
-    <img border="0" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!"
-     height="31" width="88"></a>
-    """
     res += "</body></html>"
     return res.encode('utf-8')
 
@@ -108,7 +102,7 @@ def table_header():
         """
 
 def table_footer():
-    return '</table><br/><p>non-NEW uploads are <a href="/deferred/">available</a>, see the <a href="ftp://ftp-master.debian.org/pub/UploadQueue/README">UploadQueue-README</a> for more information.</p></center><br/>\n'
+    return '</table><br/><p>non-NEW uploads are <a href="/deferred/">available</a> (<a href="/deferred/status">machine readable version</a>), see the <a href="ftp://ftp-master.debian.org/pub/UploadQueue/README">UploadQueue-README</a> for more information.</p></center><br/>\n'
 
 def table_row(changesname, delay, changed_by, closes, fingerprint):
     global row_number
@@ -191,7 +185,7 @@ def get_upload_data(changesfn):
     uploader = achanges.get('changed-by')
     uploader = re.sub(r'^\s*(\S.*)\s+<.*>',r'\1',uploader)
     with utils.open_file(changesfn) as f:
-        fingerprint = SignedFile(f.read(), keyrings=get_active_keyring_paths()).fingerprint
+        fingerprint = SignedFile(f.read(), keyrings=get_active_keyring_paths(), require_signature=False).fingerprint
     if Cnf.has_key("Show-Deferred::LinkPath"):
         isnew = 0
         suites = get_suites_source_in(achanges['source'])