X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=inline;f=dak%2Fshow_deferred.py;h=afa12b4b2b5658d601d38bbb7c84f1e8902cb4c3;hb=b43634b6faf221ee10fc63116baead379f68f92f;hp=d3cf65302da6c6c6ee8a030c17b49eea7c24ed09;hpb=8afb0f3d9832ab1c51bdce8aa4c12c2684835603;p=dak.git

diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index d3cf6530..afa12b4b 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
@@ -82,7 +88,15 @@ def header():
         """
 
 def footer():
-    res = "<p class=\"validate\">Timestamp: %s (UTC)</p>" % (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
+    res = """
+<p><img src="deferred-day.png" alt="deferred, last day"></p>
+<p><img src="deferred-week.png" alt="deferred, last week"></p>
+<p><img src="deferred-month.png" alt="deferred, last month"></p>
+<p><img src="deferred-year.png" alt="deferred, last year"></p>
+<p><img src="deferred-5years.png" alt="deferred, last 5 years"></p>
+<p><img src="deferred-10years.png" alt="deferred, last 10 years"></p>
+"""
+    res += "<p class=\"validate\">Timestamp: %s (UTC)</p>" % (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
     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">
@@ -102,7 +116,6 @@ def table_header():
           <th align="center">Closes</th>
         </tr>
         """
-    return res
 
 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'
@@ -174,7 +187,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])