X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fshow_deferred.py;h=2c88030c5f5a80fae91f64c11f6962d805f79c82;hb=245c6549dbacaeab5ee36ec74372b1df8675b477;hp=53f568e0df60844bd470095c330a03c8b1f13e94;hpb=4b758c038852134ec0cee774cd934a9b71cf3d1d;p=dak.git
diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index 53f568e0..2c88030c 100755
--- 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
@@ -53,32 +45,32 @@ def header():
Deferred uploads to Debian
-
+
-  |
Deferred uploads to Debian |
-  |
-  |
-  |
@@ -87,12 +79,6 @@ def header():
def footer():
res = "Timestamp: %s (UTC)
" % (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
res += "There are graphs about the queues available.
"
- res += """
- 
-
- 
- """
res += ""
return res.encode('utf-8')
@@ -108,7 +94,7 @@ def table_header():
"""
def table_footer():
- return '
non-NEW uploads are available, see the UploadQueue-README for more information.
\n'
+ return '
non-NEW uploads are available (machine readable version), see the UploadQueue-README for more information.
\n'
def table_row(changesname, delay, changed_by, closes, fingerprint):
global row_number
@@ -117,7 +103,7 @@ def table_row(changesname, delay, changed_by, closes, fingerprint):
res += (2*'%s | ')%tuple(map(html_escape,(changesname,delay)))
res += '%s
Fingerprint: %s | ' % (html_escape(changed_by), fingerprint)
res += ('%s | ' %
- ''.join(map(lambda close: '#%s
' % (close, close),closes)))
+ ''.join(map(lambda close: '#%s
' % (close, close),closes)))
res += '\n'
row_number+=1
return res
@@ -191,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'])
-
- 
+
+ 
+
+ 