pld-builder.new: PLD_Builder/install_br.py Uninstall packages via ...

[arekm]

Author: arekm                        Date: Sun Mar 16 20:19:55 2008 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
Uninstall packages via upgrade.close_killset() helper.

---- Files affected:
pld-builder.new/PLD_Builder:
   install_br.py (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/install_br.py
diff -u pld-builder.new/PLD_Builder/install_br.py:1.14 pld-builder.new/PLD_Builder/install_br.py:1.15
--- pld-builder.new/PLD_Builder/install_br.py:1.14	Sun Mar 16 21:04:44 2008
+++ pld-builder.new/PLD_Builder/install_br.py	Sun Mar 16 21:19:50 2008
@@ -4,6 +4,8 @@
 import string
 
 import chroot
+import util
+import upgrade
 
 def install_br(r, b):
     tmpdir = "/tmp/BR." + b.b_id[0:6]
@@ -34,7 +36,7 @@
     # check conflicts in BRed packages
     b.log_line("checking conflicting packages in BRed packages")
     f = chroot.popen("poldek --test --caplookup -Q -v --upgrade %s" % br, user = "root")
-    rx = re.compile(r".*conflicts with installed ([^\s]+)")
+    rx = re.compile(r".*conflicts with installed [^\s]+)-[^-]+-[^-]+$")
     conflicting = {}
     for l in f.xreadlines():
         b.log_line("rpm: %s" % l)
@@ -44,15 +46,10 @@
     if len(conflicting) == 0:
         b.log_line("no conflicts found")
     else:
-        ncf = ""
-        for cfe in conflicting.keys():
-            ncf = ncf + " " + re.escape(cfe)
-        cf = string.strip(cfe)
         b.log_line("uninstalling conflicting packages")
-        res = chroot.run("poldek -Q -v --noask --erase %s" % br,
-                user = "root",
-                logfile = b.logfile)
-        if res != 0:
+        err = upgrade.close_killset(conflicting)
+        if err != "":
+            util.append_to(b.logfile, err)
             b.log_line("error: conflicting packages uninstallation failed")
     b.log_line("installing BR: %s" % br)
     res = chroot.run("poldek --caplookup -Q -v --upgrade %s" % br,
================================================================

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