Correctly match conflicting package.

Changed files:
    PLD_Builder/install.py -> 1.7

diff --git a/PLD_Builder/install.py b/PLD_Builder/install.py
index 5908919cd50e32cd4f967638ce592af9199cb390..43cf6ad5e811363ccde76775c247b63cd918dc34 100644 (file)
--- a/PLD_Builder/install.py
+++ b/PLD_Builder/install.py
@@ -105,7 +105,7 @@ def uninstall_self_conflict(b):
     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())