Author: ankry Date: Fri Feb 18 08:07:26 2005 GMT
Module: pld-builder.new Tag: WORKING
---- Log message:
- support for new buildlogs scheme URL
---- Files affected:
pld-builder.new/PLD_Builder:
request.py (1.27.2.1 -> 1.27.2.2)
---- Diffs:
================================================================
Index: pld-builder.new/PLD_Builder/request.py
diff -u pld-builder.new/PLD_Builder/request.py:1.27.2.1
pld-builder.new/PLD_Builder/request.py:1.27.2.2
--- pld-builder.new/PLD_Builder/request.py:1.27.2.1 Sun Oct 17 21:40:13 2004
+++ pld-builder.new/PLD_Builder/request.py Fri Feb 18 09:07:21 2005
@@ -185,14 +185,10 @@
(self.src_rpm, self.spec, self.branch, self.bconds_string())
f.write("%s <small>[" % desc)
builders = []
+ bl_lines = { "nest":0, "ra":1, "ac":2, "th":3 }
bl_archs = {
- "th-SRPMS":0, "th-i486":1, "th-i686":2, "th-athlon":3, "th-ia64":4,
- "th-alpha":5, "th-sparc":6, "th-ppc":7,
- "ac-SRPMS":8, "ac-i386":9, "ac-i586":10, "ac-i686":11, "ac-athlon":12,
- "ac-amd64":13, "ac-alpha":14, "ac-sparc":15, "ac-ppc":16,
- "ra-i386":17, "ra-i586":18, "ra-i686":19, "ra-alpha":20,
- "ra-sparc":21, "ra-ppc":22, "nest-i486":23, "nest-i686":24,
- "nest-alpha":25, "nest-ppc":26
+ "SRPMS":0, "i386":1, "i486":2, "i586":3, "i686":4, "athlon":5,
+ "ia64":6, "amd64":7, "alpha":8, "sparc":9, "sparc64":10, "ppc":11
}
for b in self.builders:
s = self.builders_status[b]
@@ -206,7 +202,8 @@
c = "black"
link_pre = ""
link_post = ""
- if bl_archs.has_key(b) and (s == "OK" or s == "FAIL") and len(self.spec)
> 5:
+ bld = b.split('-')
+ if bl_lines.has_key(bld[0]) and bl_archs.has_key(bld[1]) and (s == "OK"
or s == "FAIL") and len(self.spec) > 5:
if self.is_command():
bl_name = "command"
else:
@@ -214,8 +211,8 @@
path = "/%s/%s/%s.bz2" % (b.replace('-','/'), s, bl_name)
is_ok = 0
if s == "OK": is_ok = 1
- link_pre = "<a
href=\"http://buildlogs.pld-linux.org/index.php?idx=%d&ok=%d&id=%s\";>" \
- % (bl_archs[b], is_ok,
binascii.b2a_hex(md5.new(path).digest()))
+ link_pre = "<a
href=\"http://buildlogs.pld-linux.org/index.php?dist=%s&arch=%s&ok=%d&id=%s\";>"
\
+ % (bld[0], bld[1], is_ok,
binascii.b2a_hex(md5.new(path).digest()))
link_post = "</a>"
builders.append(link_pre + ("<font color='%s'><b>%s:%s</b></font>" % (c,
b, s)) + link_post)
f.write("%s]</small></li>\n" % string.join(builders))
================================================================
---- CVS-web:
http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/request.py?r1=1.27.2.1&r2=1.27.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
