pld-builder.new: PLD_Builder/request.py Use r.id from Group.

[arekm]

Author: arekm                        Date: Tue Jan 20 08:54:36 2009 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
Use r.id from Group.

---- Files affected:
pld-builder.new/PLD_Builder:
   request.py (1.49 -> 1.50) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/request.py
diff -u pld-builder.new/PLD_Builder/request.py:1.49 pld-builder.new/PLD_Builder/request.py:1.50
--- pld-builder.new/PLD_Builder/request.py:1.49	Tue Jan 20 09:51:50 2009
+++ pld-builder.new/PLD_Builder/request.py	Tue Jan 20 09:54:31 2009
@@ -93,7 +93,7 @@
                  self.id, self.priority, string.join(self.flags)))
         f.write("<ul>\n")
         for b in self.batches:
-            b.dump_html(f)
+            b.dump_html(f, self.id)
         f.write("</ul>\n")
         f.write("</p>\n")
 
@@ -187,7 +187,7 @@
     def is_command(self):
         return self.command != ""
 
-    def dump_html(self, f):
+    def dump_html(self, f, rid):
         f.write("<li>\n")
         if self.is_command():
             desc = "SH: %s [%s]" % (self.command, ' '.join(self.command_flags))
@@ -214,13 +214,13 @@
                 else:
                     bl_name = self.spec[:len(self.spec)-5]
                 lin_ar = b.replace('noauto-','')
-                path = "/%s/%s/%s,%s.bz2" % (lin_ar.replace('-','/'), s, bl_name, self.gb_id)
+                path = "/%s/%s/%s,%s.bz2" % (lin_ar.replace('-','/'), s, bl_name, rid)
                 is_ok = 0
                 if s == "OK":
                     is_ok = 1
                 bld = lin_ar.split('-')
                 link_pre = "<a href=\"http://buildlogs.pld-linux.org/index.php?dist=%s&arch=%s&ok=%d&name=%s&id=%s\">" \
-                     % (bld[0], bld[1], is_ok, bl_name, self.gb_id)
+                     % (bld[0], bld[1], is_ok, bl_name, rid)
                 link_post = "</a>"
             builders.append(link_pre + ("<font color='%s'><b>%s:%s</b></font>" %
                                         (c, b, s)) + link_post)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/request.py?r1=1.49&r2=1.50&f=u