pld-builder.new: PLD_Builder/buildlogs.py, PLD_Builder/build.py - use reque...

[arekm]

Author: arekm                        Date: Tue Jan 20 08:20:35 2009 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- use request id

---- Files affected:
pld-builder.new/PLD_Builder:
   buildlogs.py (1.17 -> 1.18) , build.py (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/buildlogs.py
diff -u pld-builder.new/PLD_Builder/buildlogs.py:1.17 pld-builder.new/PLD_Builder/buildlogs.py:1.18
--- pld-builder.new/PLD_Builder/buildlogs.py:1.17	Tue Jan 20 09:01:04 2009
+++ pld-builder.new/PLD_Builder/buildlogs.py	Tue Jan 20 09:20:30 2009
@@ -17,11 +17,10 @@
     def init(self, g):
         self.requester_email = g.requester_email
 
-    def add(self, logfile, failed):
+    def add(self, logfile, failed, id):
         # if /dev/null, don't even bother to store it
         if config.buildlogs_url == "/dev/null":
             return
-        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))

================================================================
Index: pld-builder.new/PLD_Builder/build.py
diff -u pld-builder.new/PLD_Builder/build.py:1.8 pld-builder.new/PLD_Builder/build.py:1.9
--- pld-builder.new/PLD_Builder/build.py:1.8	Thu Feb 17 21:23:35 2005
+++ pld-builder.new/PLD_Builder/build.py	Tue Jan 20 09:20:30 2009
@@ -67,13 +67,13 @@
                     notify.add_batch(batch, "OK")
                 batch.build_time = stopwatch.stop()
                 report.add_pld_builder_info(batch)
-                buildlogs.add(batch.logfile, failed = batch.build_failed)
+                buildlogs.add(batch.logfile, failed = batch.build_failed, id=r.id)
             else:
                 log.notice("not running command, not for me.")
                 batch.build_failed = 0
                 batch.log_line("queued command %s for other builders" % batch.command)
                 r.some_ok = 1
-                buildlogs.add(batch.logfile, failed = batch.build_failed)
+                buildlogs.add(batch.logfile, failed = batch.build_failed, id=r.id)
         elif can_build:
             log.notice("building %s" % batch.spec)
             stopwatch.start()
@@ -91,7 +91,7 @@
                 notify.add_batch(batch, "OK")
             batch.build_time = stopwatch.stop()
             report.add_pld_builder_info(batch)
-            buildlogs.add(batch.logfile, failed = batch.build_failed)
+            buildlogs.add(batch.logfile, failed = batch.build_failed, id=r.id)
         else:
             batch.build_failed = 1
             batch.skip_reason = "SKIPED [%s failed]" % failed_dep
================================================================

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