Merge branch 'master' of /org/ftp.debian.org/dak//

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index 57a63b2d867d3718defe9101caf6595edd1acedb..ce1d43e621c5f11acc8e3291600beaf72b1f7b3c 100755 (executable)
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -10,5 +10,5 @@ export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
 date -u > $ftpdir/project/trace/ftp-master.debian.org
 dak import-users-from-passwd
 dak queue-report -n > $webdir/new.html
-/srv/queued/debianqueued-0.9/show-deferred /srv/queued/DEFERRED/ > ${webdir}/deferred.html
+dak show-deferred > ${webdir}/deferred.html
 cd $queuedir/new ; dak show-new *.changes > /dev/null

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 75ea43ef379e7895ed4ce7f29956f3be423c47d7..b8e1a4811f49a3e0a507f48feb844c8c516493ab 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -129,6 +129,7 @@ Show-New
 Show-Deferred
 {
   LinkPath "/srv/ftp.debian.org/web/deferred/";
+  DeferredQueue "/srv/queued/DEFERRED/";
 }
 
 Import-Users-From-Passwd

diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index 81c117b148e64c3c9b9b1fee844188720c2a7d1e..6c24c23787aac7ba3162f447515e1435e85c5a60 100755 (executable)
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -105,7 +105,7 @@ def table_row(changesname, delay, changed_by, closes):
 
     res = '<tr class="%s">'%((row_number%2) and 'odd' or 'even')
     res += (3*'<td valign="top">%s</td>')%tuple(map(html_escape,(changesname,delay,changed_by)))
-    res += ('<td valign="top">%s</td>' % 
+    res += ('<td valign="top">%s</td>' %
              ''.join(map(lambda close:  '<a href="http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%s">#%s</a><br>' % (close, close),closes)))
     res += '</tr>\n'
     row_number+=1
@@ -164,21 +164,28 @@ def usage (exit_code=0):
         f = sys.stderr
     else:
         f = sys.stdout
-    print >> f, """Usage: dak show-deferred /path/to/DEFERRED
-  -h, --help                show this help and exit.
-  -p, --html-path [path]    override output directory.
+    print >> f, """Usage: dak show-deferred
+  -h, --help                    show this help and exit.
+  -p, --link-path [path]        override output directory.
+  -d, --deferred-queue [path]   path to the deferred queue
   """
     sys.exit(exit_code)
-   
+
 def init():
     global Cnf, Options, Upload, projectB
     Cnf = utils.get_conf()
     Arguments = [('h',"help","Show-Deferred::Options::Help"),
-                 ("p","link-path","Show-Deferred::LinkPath","HasArg")]
+                 ("p","link-path","Show-Deferred::LinkPath","HasArg"),
+                 ("d","deferred-queue","Show-Deferred::DeferredQueue","HasArg")]
+    args = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
     for i in ["help"]:
         if not Cnf.has_key("Show-Deferred::Options::%s" % (i)):
             Cnf["Show-Deferred::Options::%s" % (i)] = ""
-    args = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
+    for i,j in [("DeferredQueue","--deferred-queue")]:
+        if not Cnf.has_key("Show-Deferred::%s" % (i)):
+            print >> sys.stderr, """Show-Deferred::%s is mandatory.
+  set via config file or command-line option %s"""%(i,j)
+
     Options = Cnf.SubTree("Show-Deferred::Options")
     if Options["help"]:
         usage()
@@ -188,11 +195,11 @@ def init():
 
 def main():
     args = init()
-    if len(args)!=1:
+    if len(args)!=0:
         usage(1)
-    
+
     filelist = []
-    for r,d,f  in os.walk(args[0]):
+    for r,d,f  in os.walk(Cnf["Show-Deferred::DeferredQueue"]):
         filelist += map (lambda x: os.path.join(r,x),
                          filter(lambda x: x.endswith('.changes'), f))
     list_uploads(filelist)

diff --git a/daklib/database.py b/daklib/database.py
index 1d9f3c0bc9bf052f638dff9be43a08a451ae6904..5c7bd8387240b328073b6641817afaa21aa8c768 100755 (executable)
--- a/daklib/database.py
+++ b/daklib/database.py
@@ -397,4 +397,3 @@ def get_suites(pkgname, src=False):
         sql = "select suite_name from binaries, bin_associations,suite where binaries.id=bin_associations.bin and  package='%s' and bin_associations.suite = suite.id"%pkgname
     q = projectB.query(sql)
     return map(lambda x: x[0], q.getresult())
-