pld-builder.new: PLD_Builder/buildlogs.py .bz2 suffix at the end.

arekm arekm at pld-linux.org
Tue Jan 20 09:01:09 CET 2009


Author: arekm                        Date: Tue Jan 20 08:01:09 2009 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
.bz2 suffix at the end.

---- Files affected:
pld-builder.new/PLD_Builder:
   buildlogs.py (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/buildlogs.py
diff -u pld-builder.new/PLD_Builder/buildlogs.py:1.16 pld-builder.new/PLD_Builder/buildlogs.py:1.17
--- pld-builder.new/PLD_Builder/buildlogs.py:1.16	Tue Jan 20 00:03:26 2009
+++ pld-builder.new/PLD_Builder/buildlogs.py	Tue Jan 20 09:01:04 2009
@@ -21,8 +21,8 @@
         # 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)) + ".bz2"
         id = util.uuid()
+        name = re.sub(r"\.spec\.log", "", os.path.basename(logfile)) + "," + id + ".bz2"
         ret = os.system("bzip2 --best --force < %s > %s" \
                     % (logfile, path.buildlogs_queue_dir + id))
         if ret:
@@ -38,13 +38,13 @@
 
     def flush(self):
         def desc(l):
-            return """Target: %s/%s,%s
+            return """Target: %s/%s
 Builder: %s
 Time: %d
 Type: buildlog
 Requester: %s
 END
-""" % (config.buildlogs_url, l['name'], l['id'], config.builder, time.time(), self.requester_email)
+""" % (config.buildlogs_url, l['name'], config.builder, time.time(), self.requester_email)
         
         for l in self.queue:
             f = open(path.buildlogs_queue_dir + l['id'] + ".desc", "w")
================================================================

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



More information about the pld-cvs-commit mailing list