X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fshow_deferred.py;h=6c24c23787aac7ba3162f447515e1435e85c5a60;hb=4174e2aacdbdfe37dad623ab5c9fe1522255d954;hp=695292251e8d18c86e0a0e6e91f3ae33c0186411;hpb=501f07188bbf7217d3a982e50b7e82a804738438;p=dak.git

diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index 69529225..6c24c237 100755
--- 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,23 +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")]
-    for i in ["help"]:
-        if not Cnf.has_key("Show-Deferred::Options::LinkPath"):
-            Cnf["Show-Deferred::Options::LinkPath"] = "/org/ftp.debian.org/web/deferred/"
-    if not Cnf.has_key("Show-Deferred::Options::%s" % (i)):
-          Cnf["Show-Deferred::Options::%s" % (i)] = ""
+                 ("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)] = ""
+    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()
@@ -190,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)