pld-builder.new: PLD_Builder/install_br.py close_killset() doesn't...

[arekm]

Author: arekm                        Date: Tue Mar 18 21:37:08 2008 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
close_killset() doesn't actually remove packages. Remove packages on our own.

---- Files affected:
pld-builder.new/PLD_Builder:
   install_br.py (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/install_br.py
diff -u pld-builder.new/PLD_Builder/install_br.py:1.18 pld-builder.new/PLD_Builder/install_br.py:1.19
--- pld-builder.new/PLD_Builder/install_br.py:1.18	Tue Mar 18 21:55:49 2008
+++ pld-builder.new/PLD_Builder/install_br.py	Tue Mar 18 22:37:03 2008
@@ -51,6 +51,13 @@
         if err != "":
             util.append_to(b.logfile, err)
             b.log_line("error: conflicting packages uninstallation failed")
+        else:
+            k = string.join(conlicting.keys())
+            b.log_line("removing %s" % k)
+            res = chroot.run("poldek --noask --erase %s" % k, logfile = b.logfile, user = "root")
+            if res != 0:
+                b.log_line("package removal failed")
+                return res
     b.log_line("installing BR: %s" % br)
     res = chroot.run("poldek --caplookup -Q -v --upgrade %s" % br,
             user = "root",
================================================================

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