pld-builder.new: PLD_Builder/buildlogs.py Store separate log for each build...
arekm
arekm at pld-linux.org
Mon Oct 5 22:46:06 CEST 2009
Author: arekm Date: Mon Oct 5 20:46:06 2009 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
Store separate log for each build when sending more than one spec in single request.
---- Files affected:
pld-builder.new/PLD_Builder:
buildlogs.py (1.22 -> 1.23)
---- Diffs:
================================================================
Index: pld-builder.new/PLD_Builder/buildlogs.py
diff -u pld-builder.new/PLD_Builder/buildlogs.py:1.22 pld-builder.new/PLD_Builder/buildlogs.py:1.23
--- pld-builder.new/PLD_Builder/buildlogs.py:1.22 Mon Oct 5 22:24:39 2009
+++ pld-builder.new/PLD_Builder/buildlogs.py Mon Oct 5 22:46:01 2009
@@ -22,19 +22,20 @@
# if /dev/null, don't even bother to store it
if config.buildlogs_url == "/dev/null":
return
- name = re.sub(r"\.spec\.log", "", os.path.basename(logfile)) + "," + id + ".bz2"
+ blogfile = os.path.basename(logfile)
+ name = re.sub(r"\.spec\.log", "", blogfile) + "," + id + '.' + blogfile + ".bz2"
ret = os.system("bzip2 --best --force < %s > %s" \
- % (logfile, path.buildlogs_queue_dir + '/' + id))
+ % (logfile, path.buildlogs_queue_dir + '/' + id '.' + blogfile))
if ret:
log.error("bzip2 compression of %s failed; does bzip2 binary exist?" % (logfile))
if failed: s = "FAIL"
else: s = "OK"
- f = open(path.buildlogs_queue_dir + '/' + id + ".info", "w")
+ f = open(path.buildlogs_queue_dir + '/' + id + '.' + blogfile + ".info", "w")
f.write("Status: %s\nEND\n" % s)
f.close()
- self.queue.append({'name': name, 'id': id, 'failed': failed})
+ self.queue.append({'name': name, 'id': id + '.' + blogfile, 'failed': failed})
def flush(self):
def desc(l):
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/buildlogs.py?r1=1.22&r2=1.23&f=u
More information about the pld-cvs-commit
mailing list