Merge branch 'psycopg2' into content_generation

[dak.git] / dak / show_deferred.py

diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index 6c24c23787aac7ba3162f447515e1435e85c5a60..e9266bcc03f4aa33a60483b9dc24779e5b146323 100755 (executable)
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# based on queue-report
+""" Overview of the DEFERRED queue, based on queue-report """
 #    Copyright (C) 2001, 2002, 2003, 2005, 2006  James Troup <james@nocrew.org>
 # Copyright (C) 2008 Thomas Viehmann <tv@beamnet.de>
 
@@ -22,17 +22,25 @@
 
 import sys, os, re, time
 import apt_pkg
+import tempfile
 from debian_bundle import deb822
 from daklib import database
 from daklib import queue
 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
 
-html_escaping = {'"':'&quot;', '&':'&amp;', '<':'&lt;', '>':'&gt;'}
-re_html_escaping = re.compile('|'.join(map(re.escape, html_escaping.keys())))
 def html_escape(s):
     return re_html_escaping.sub(lambda x: html_escaping.get(x.group(0)), s)
 
@@ -145,19 +153,40 @@ def get_upload_data(changesfn):
                 if os.path.exists(qfn):
                     os.symlink(qfn,lfn)
                     os.chmod(qfn, 0644)
-    return (delaydays*24*60*60+remainingtime, changesname, delay, uploader, achanges.get('closes').split())
+    return (max(delaydays-1,0)*24*60*60+remainingtime, changesname, delay, uploader, achanges.get('closes','').split(),achanges)
 
 def list_uploads(filelist):
     uploads = map(get_upload_data, filelist)
     uploads.sort()
+    # print the summary page
     print header()
     if uploads:
         print table_header()
-        print ''.join(map(lambda x: table_row(*x[1:]), uploads))
+        print ''.join(map(lambda x: table_row(*x[1:5]), uploads))
         print table_footer()
     else:
         print '<h1>Currently no deferred uploads to Debian</h1>'
     print footer()
+    # machine readable summary
+    if Cnf.has_key("Show-Deferred::LinkPath"):
+        fn = os.path.join(Cnf["Show-Deferred::LinkPath"],'.status.tmp')
+        f = open(fn,"w")
+        try:
+            for u in uploads:
+                print >> f, "Changes: %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])
+                print >> f, fields
+                print >> f, str(u[5]).rstrip()
+                open(os.path.join(Cnf["Show-Deferred::LinkPath"],u[1]),"w").write(str(u[5])+fields+'\n')
+                print >> f
+            f.close()
+            os.rename(os.path.join(Cnf["Show-Deferred::LinkPath"],'.status.tmp'),
+                      os.path.join(Cnf["Show-Deferred::LinkPath"],'status'))
+        except:
+            os.unlink(fn)
+            raise
 
 def usage (exit_code=0):
     if exit_code:
@@ -204,11 +233,12 @@ def main():
                          filter(lambda x: x.endswith('.changes'), f))
     list_uploads(filelist)
 
+    available_changes = set(map(os.path.basename,filelist))
     if Cnf.has_key("Show-Deferred::LinkPath"):
         # remove dead links
         for r,d,f in os.walk(Cnf["Show-Deferred::LinkPath"]):
             for af in f:
-                af = os.path.join(r,af)
-                if not os.path.exists(af):
-                    print >> sys.stderr, "obsolete",af
-                    os.unlink(af)
+                afp = os.path.join(r,af)
+                if (not os.path.exists(afp) or
+                    (af.endswith('.changes') and af not in available_changes)):
+                    os.unlink(afp)