Suppress warnings in the most suitable files.

[dak.git] / dak / show_deferred.py

diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index e8e1621d2f957cb51c861329e12377e6e780dff1..fac1692724f970fa736412506a901335c52bcbb5 100755 (executable)
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -22,7 +22,14 @@
 
 import sys, os, re, time
 import apt_pkg
-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
@@ -101,7 +108,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'
@@ -173,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])