pld-builder.new: PLD_Builder/install.py Correctly match conflicting package.

[arekm]

Author: arekm                        Date: Sun Aug 10 21:45:59 2008 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
Correctly match conflicting package.

---- Files affected:
pld-builder.new/PLD_Builder:
   install.py (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/install.py
diff -u pld-builder.new/PLD_Builder/install.py:1.6 pld-builder.new/PLD_Builder/install.py:1.7
--- pld-builder.new/PLD_Builder/install.py:1.6	Sun Aug 10 23:41:10 2008
+++ pld-builder.new/PLD_Builder/install.py	Sun Aug 10 23:45:54 2008
@@ -105,7 +105,7 @@
     tmpdir = "/tmp/BR." + b.b_id[0:6]
     f = chroot.popen("cd rpm/SPECS; TMPDIR=%s rpmbuild -bp --nobuild --short-circuit --define 'prep exit 0' %s %s 2>&1" \
             % (tmpdir, rpmbuild_opt, b.spec))
-    rx = re.compile(r".*conflicts with ([^\s]+-[^-]+-[^-]+)\.src$")
+    rx = re.compile(r"\s+(\w+)\s+.*\s+conflicts with [^\s]+-[^-]+-[^-]+\.src$")
     conflicting = {}
     for l in f.xreadlines():
         b.log_line("rpmbuild: %s" % l.rstrip())
================================================================

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