X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fshow_deferred.py;h=aa33b2e5de99414eecc57fede9844e8d8425b7e6;hb=276e9002288432328879ada4ddc2dcefbb55158c;hp=81c117b148e64c3c9b9b1fee844188720c2a7d1e;hpb=b478500c58727a40b9ce6de765012160e93fd095;p=dak.git
diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index 81c117b1..aa33b2e5 100755
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -105,7 +105,7 @@ def table_row(changesname, delay, changed_by, closes):
res = '
'%((row_number%2) and 'odd' or 'even')
res += (3*'%s | ')%tuple(map(html_escape,(changesname,delay,changed_by)))
- res += ('%s | ' %
+ res += ('%s | ' %
''.join(map(lambda close: '#%s
' % (close, close),closes)))
res += '
\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)
@@ -203,5 +210,5 @@ def main():
for af in f:
af = os.path.join(r,af)
if not os.path.exists(af):
- print >> sys.stderr, "obsolete",af
+ #print >> sys.stderr, "obsolete",af
os.unlink(af)