X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fshow_deferred.py;h=fac1692724f970fa736412506a901335c52bcbb5;hb=4830d9be143c7645ea932b53fae095e275ad7814;hp=d3cf65302da6c6c6ee8a030c17b49eea7c24ed09;hpb=8afb0f3d9832ab1c51bdce8aa4c12c2684835603;p=dak.git diff --git a/dak/show_deferred.py b/dak/show_deferred.py index d3cf6530..fac16927 100755 --- a/dak/show_deferred.py +++ b/dak/show_deferred.py @@ -22,8 +22,14 @@ import sys, os, re, time import apt_pkg -import tempfile -from debian_bundle import deb822 + +try: + # starting with squeeze + from debian import deb822 +except: + # up to lenny + from debian_bundle import deb822 + from daklib.dbconn import * from daklib import utils from daklib.regexes import re_html_escaping, html_escaping @@ -102,7 +108,6 @@ def table_header(): Closes """ - return res def table_footer(): return '

non-NEW uploads are available, see the UploadQueue-README for more information.


\n' @@ -174,7 +179,7 @@ def list_uploads(filelist): f = open(fn,"w") try: for u in uploads: - print >> f, "Changes: %s"%u[1] + print >> f, "Changes-file: %s"%u[1] fields = """Location: DEFERRED Delayed-Until: %s Delay-Remaining: %s"""%(time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(time.time()+u[0])),u[2])