X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=tools%2Fdebianqueued-0.9%2Fshow-deferred;h=9cb093d01b77bf75ecaee1453c6e0b70642f40dc;hb=e3d86776388934031a347011c015b9198dea006d;hp=0f70d42a0191a019e616ab724915267a020b4092;hpb=c8f4bd41d2a06623368a2a86190617be3e59128f;p=dak.git

diff --git a/tools/debianqueued-0.9/show-deferred b/tools/debianqueued-0.9/show-deferred
index 0f70d42a..9cb093d0 100755
--- a/tools/debianqueued-0.9/show-deferred
+++ b/tools/debianqueued-0.9/show-deferred
@@ -121,7 +121,7 @@ def get_upload_data(changesfn):
     #print dir(achanges)
     #print achanges.keys()
     uploader = achanges.get('changed-by')
-    uploader = re.sub(r'\s+(\S.*)\s+<.*>',r'\1',uploader)
+    uploader = re.sub(r'^\s*(\S.*)\s+<.*>',r'\1',uploader)
     return (delaydays*24*60*60+remainingtime, changesname, delay, uploader, achanges.get('closes').split())
 
 def list_uploads(filelist):
@@ -136,4 +136,13 @@ def list_uploads(filelist):
         print '<h1>Currently no deferred uploads to Debian</h1>'
     print footer()
 
-list_uploads(sys.argv[1:])
+if len(sys.argv)!=2:
+    print >> sys.stderr, """Error! Invoke %s /path/to/DEFERRED"""%sys.argv[0]
+    sys.exit(1)
+    
+filelist = []
+for r,d,f  in os.walk(sys.argv[1]):
+    filelist += map (lambda x: os.path.join(r,x),
+                     filter(lambda x: x.endswith('.changes'), f))
+
+list_uploads(filelist)