pld-builder.new: PLD_Builder/rpm_builder.py Fixes.

[arekm]

Author: arekm                        Date: Fri Feb 27 21:07:34 2009 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
Fixes.

---- Files affected:
pld-builder.new/PLD_Builder:
   rpm_builder.py (1.67 -> 1.68) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/rpm_builder.py
diff -u pld-builder.new/PLD_Builder/rpm_builder.py:1.67 pld-builder.new/PLD_Builder/rpm_builder.py:1.68
--- pld-builder.new/PLD_Builder/rpm_builder.py:1.67	Fri Feb 27 19:31:41 2009
+++ pld-builder.new/PLD_Builder/rpm_builder.py	Fri Feb 27 22:07:29 2009
@@ -104,7 +104,6 @@
     if res:
         b.log_line("error: installing src rpm failed")
         res = "FAIL_SRPM_INSTALL"
-        res = 1
     else:
         prepare_env()
         chroot.run("install -m 700 -d %s" % tmpdir)
@@ -115,7 +114,7 @@
         cmd = "cd rpm/SPECS; TMPDIR=%s nice -n %s rpmbuild -bp --short-circuit --nodeps --define 'prep exit 0' %s %s" % \
             (tmpdir, config.nice, rpmbuild_opt, b.spec)
         res = chroot.run(cmd, logfile = b.logfile)
-        if res != 0:
+        if res:
             res = "UNSUPP"
             b.log_line("error: build arch check (%s) failed" % cmd)
 
@@ -129,6 +128,8 @@
                             (tmpdir, config.nice, rpmbuild_opt, b.spec)
                 b.log_line("building RPM using: %s" % cmd)
                 res = chroot.run(cmd, logfile = b.logfile)
+                if res:
+                    res = "FAIL"
                 files = util.collect_files(b.logfile)
                 if len(files) > 0:
                     r.chroot_files.extend(files)
================================================================

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