- handle conflicts case without explict version

Changed files:
    PLD_Builder/install.py -> 1.12

diff --git a/PLD_Builder/install.py b/PLD_Builder/install.py
index ea5ab91d62bd7575a4153dad090e7331af4a8661..43a42e25aba7dbd303c6156e5da47d5a1300ceb3 100644 (file)
--- a/PLD_Builder/install.py
+++ b/PLD_Builder/install.py
@@ -105,7 +105,9 @@ 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"\s+([\w-]+)\s+.*\s+conflicts with [^\s]+-[^-]+-[^-]+\.src$")
+    # java-sun >= 1.5 conflicts with soprano-2.1.67-1.src
+    # java-sun conflicts with soprano-2.1.67-1.src
+    rx = re.compile(r"\s+([\w-]+)\s+.*conflicts with [^\s]+-[^-]+-[^-]+\.src$")
     conflicting = {}
     for l in f.xreadlines():
         m = rx.search(l)