X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=tools%2Fdebianqueued-0.9%2Fshow-deferred;h=fb5af5299b28103b793bd7b1f034c12df26700c2;hb=569536b486f9443c8c0469608d2cf72b5a3fdab8;hp=376dff37aea5b71a27fd197c255f857bc868bc49;hpb=1a9500aea0db5bd9debc3d697c342c8bee2160dd;p=dak.git

diff --git a/tools/debianqueued-0.9/show-deferred b/tools/debianqueued-0.9/show-deferred
index 376dff37..fb5af529 100755
--- a/tools/debianqueued-0.9/show-deferred
+++ b/tools/debianqueued-0.9/show-deferred
@@ -25,7 +25,7 @@ from debian_bundle import deb822
 
 ################################################################################
 
-row_number = 0
+row_number = 1
 
 html_escaping = {'"':'&quot;', '&':'&amp;', '<':'&lt;', '>':'&gt;'}
 re_html_escaping = re.compile('|'.join(map(re.escape, html_escaping.keys())))
@@ -99,7 +99,7 @@ def table_footer():
 def table_row(changesname, delay, changed_by, closes):
     global row_number
 
-    res = '<tr class="%s">'%(['even','odd'][row_number %2])
+    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>' % 
              ''.join(map(lambda close:  '<a href="http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%s">#%s</a><br>' % (close, close),closes)))
@@ -114,14 +114,14 @@ def get_upload_data(changesfn):
     m = re.match(r'([0-9]+)-day', delay)
     if m:
         delaydays = int(m.group(1))
-        remainingtime = max(0,24*60*60+os.stat(changesfn).st_mtime-time.time())
-        delay = "%d days %02d:%02d" %(delaydays, int(remainingtime/3600),int(remainingtime/60)%60)
+        remainingtime = (delaydays>0)*max(0,24*60*60+os.stat(changesfn).st_mtime-time.time())
+        delay = "%d days %02d:%02d" %(max(delaydays-1,0), int(remainingtime/3600),int(remainingtime/60)%60)
     else:
         remainingtime = 0
     #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):