pld-builder.new: PLD_Builder/install.py Another conflict.

[arekm]

Author: arekm                        Date: Thu Mar 12 07:33:19 2009 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
Another conflict.

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

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/install.py
diff -u pld-builder.new/PLD_Builder/install.py:1.14 pld-builder.new/PLD_Builder/install.py:1.15
--- pld-builder.new/PLD_Builder/install.py:1.14	Fri Feb 20 15:16:30 2009
+++ pld-builder.new/PLD_Builder/install.py	Thu Mar 12 08:33:14 2009
@@ -151,7 +151,8 @@
     # check conflicts in BRed packages
     b.log_line("checking conflicting packages in BRed packages")
     f = chroot.popen("poldek --test --noask --caplookup -Q -v --upgrade %s" % br, user = "root")
-    rx = re.compile(r".*conflicts with installed ([^\s]+)-[^-]+-[^-]+($| .*)")
+    # phonon-devel-4.3.1-1.i686 conflicts with qt4-phonon-devel-4.5.0-6.i686
+    rx = re.compile(r".*conflicts with( installed|) ([^\s]+)-[^-]+-[^-]+($| .*)")
     conflicting = {}
     for l in f.xreadlines():
         b.log_line("poldek: %s" % l.rstrip())
================================================================

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