pld-builder.new: PLD_Builder/install.py, PLD_Builder/rpm_builder.py return ...

[arekm]

Author: arekm                        Date: Sun Aug 10 21:35:05 2008 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
return False means something failed. Issue True/False correctly.

---- Files affected:
pld-builder.new/PLD_Builder:
   install.py (1.4 -> 1.5) , rpm_builder.py (1.64 -> 1.65) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/install.py
diff -u pld-builder.new/PLD_Builder/install.py:1.4 pld-builder.new/PLD_Builder/install.py:1.5
--- pld-builder.new/PLD_Builder/install.py:1.4	Sun Aug 10 23:24:06 2008
+++ pld-builder.new/PLD_Builder/install.py	Sun Aug 10 23:35:00 2008
@@ -18,6 +18,8 @@
 
 def close_killset(killset):
     k = killset.keys()
+    if len(k) == 0:
+        return True
     rx = re.compile(r' marks ([^\s]+)-[^-]+-[^-]+$')
     errors = ""
     for p in k:
@@ -110,11 +112,9 @@
         m = rx.search(l)
         if m: conflicting[m.group(1)] = 1
     f.close()
-    if len(conflicting) == 0:
-        b.log_line("no BuildConflicts found")
-    else:
-        if not uninstall(conflicting):
-            return False
+    if len(conflicting) and not uninstall(conflicting):
+        return False
+    b.log_line("no BuildConflicts found")
     return True
 
 def install_br(r, b):
@@ -138,7 +138,7 @@
     chroot.run("rm -rf %s" % tmpdir)
     if len(needed) == 0:
         b.log_line("no BR needed")
-        return
+        return True
     nbr = ""
     for bre in needed.keys():
         nbr = nbr + " " + re.escape(bre)
@@ -166,4 +166,5 @@
             logfile = b.logfile)
     if res != 0:
         b.log_line("error: BR installation failed")
-    return res
+        return False
+    return True

================================================================
Index: pld-builder.new/PLD_Builder/rpm_builder.py
diff -u pld-builder.new/PLD_Builder/rpm_builder.py:1.64 pld-builder.new/PLD_Builder/rpm_builder.py:1.65
--- pld-builder.new/PLD_Builder/rpm_builder.py:1.64	Sun Aug 10 23:19:26 2008
+++ pld-builder.new/PLD_Builder/rpm_builder.py	Sun Aug 10 23:35:00 2008
@@ -118,9 +118,9 @@
             b.log_line("error: build arch check (%s) failed" % cmd)
 
         if not res:
-            if ("no-install-br" not in r.flags) and install.uninstall_self_conflict(b):
+            if ("no-install-br" not in r.flags) and not install.uninstall_self_conflict(b):
                 res = 1
-            if ("no-install-br" not in r.flags) and install.install_br(r, b):
+            if ("no-install-br" not in r.flags) and not install.install_br(r, b):
                 res = 1
             if not res:
                 cmd = "cd rpm/SPECS; TMPDIR=%s nice -n %s rpmbuild -bb %s %s" % \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/install.py?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/rpm_builder.py?r1=1.64&r2=1.65&f=u