Merge remote-tracking branch 'jcristau/cs-set-log-suite'

[dak.git] / dak / show_deferred.py

diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index 13ce3de615ad3c99ce6757f16f8b3a2bf2575804..2c88030c5f5a80fae91f64c11f6962d805f79c82 100755 (executable)
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -31,14 +31,6 @@ from daklib.gpg import SignedFile
 from daklib import utils
 from daklib.regexes import re_html_escaping, html_escaping
 
-################################################################################
-### work around bug #487902 in debian-python 0.1.10
-deb822.Changes._multivalued_fields = {
-            "files": [ "md5sum", "size", "section", "priority", "name" ],
-            "checksums-sha1": ["sha1", "size", "name"],
-            "checksums-sha256": ["sha256", "size", "name"],
-          }
-
 ################################################################################
 
 row_number = 1
@@ -102,7 +94,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
@@ -185,7 +177,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'])