pld-builder.new: PLD_Builder/build.py, PLD_Builder/rpm_builder.py, PLD_Buil...

[arekm]

Author: arekm                        Date: Fri Feb 27 18:31:46 2009 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- building function returns 0 and non-zero (strings like FAIL, FAIL_SOMETHING) for failures.

---- Files affected:
pld-builder.new/PLD_Builder:
   build.py (1.11 -> 1.12) , rpm_builder.py (1.66 -> 1.67) , srpm_builder.py (1.51 -> 1.52) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/build.py
diff -u pld-builder.new/PLD_Builder/build.py:1.11 pld-builder.new/PLD_Builder/build.py:1.12
--- pld-builder.new/PLD_Builder/build.py:1.11	Fri Feb 27 18:48:52 2009
+++ pld-builder.new/PLD_Builder/build.py	Fri Feb 27 19:31:41 2009
@@ -87,8 +87,8 @@
                 notify.add_batch(batch, batch.build_failed)
             else:
                 r.some_ok = 1
-                log.notice("building %s OK (%s)" % (batch.spec, batch.build_failed))
-                notify.add_batch(batch, batch.build_failed)
+                log.notice("building %s OK" % (batch.spec))
+                notify.add_batch(batch, "OK")
             batch.build_time = stopwatch.stop()
             report.add_pld_builder_info(batch)
             buildlogs.add(batch.logfile, failed = batch.build_failed, id=r.id)

================================================================
Index: pld-builder.new/PLD_Builder/rpm_builder.py
diff -u pld-builder.new/PLD_Builder/rpm_builder.py:1.66 pld-builder.new/PLD_Builder/rpm_builder.py:1.67
--- pld-builder.new/PLD_Builder/rpm_builder.py:1.66	Fri Feb 27 18:45:07 2009
+++ pld-builder.new/PLD_Builder/rpm_builder.py	Fri Feb 27 19:31:41 2009
@@ -131,7 +131,6 @@
                 res = chroot.run(cmd, logfile = b.logfile)
                 files = util.collect_files(b.logfile)
                 if len(files) > 0:
-                    res = "OK"
                     r.chroot_files.extend(files)
                 else:
                     b.log_line("error: No files produced.")

================================================================
Index: pld-builder.new/PLD_Builder/srpm_builder.py
diff -u pld-builder.new/PLD_Builder/srpm_builder.py:1.51 pld-builder.new/PLD_Builder/srpm_builder.py:1.52
--- pld-builder.new/PLD_Builder/srpm_builder.py:1.51	Fri Jul 18 13:46:13 2008
+++ pld-builder.new/PLD_Builder/srpm_builder.py	Fri Feb 27 19:31:41 2009
@@ -103,14 +103,14 @@
     if len(files) > 0:
         if len(files) > 1:
             util.append_to(b.logfile, "error: More than one file produced: %s" % files)
-            res = 1
+            res = "FAIL"
         last = files[len(files) - 1]
         b.src_rpm_file = last
         b.src_rpm = os.path.basename(last)
         r.chroot_files.extend(files)
     else:
         util.append_to(b.logfile, "error: No files produced.")
-        res = 1
+        res = "FAIL_NOFILES"
     if res == 0 and not "test-build" in r.flags:
         for pref in config.tag_prefixes:
             util.append_to(b.logfile, "Tagging with prefix: %s" % pref)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/build.py?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/rpm_builder.py?r1=1.66&r2=1.67&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/srpm_builder.py?r1=1.51&r2=1.52&f=u