pld-builder.new: PLD_Builder/install.py - handle conflicts case without exp...

arekm arekm at pld-linux.org
Thu Jan 22 21:50:21 CET 2009


Author: arekm                        Date: Thu Jan 22 20:50:21 2009 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- handle conflicts case without explict version

---- Files affected:
pld-builder.new/PLD_Builder:
   install.py (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/install.py
diff -u pld-builder.new/PLD_Builder/install.py:1.11 pld-builder.new/PLD_Builder/install.py:1.12
--- pld-builder.new/PLD_Builder/install.py:1.11	Mon Sep  1 22:23:58 2008
+++ pld-builder.new/PLD_Builder/install.py	Thu Jan 22 21:50:16 2009
@@ -105,7 +105,9 @@
     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)
================================================================

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



More information about the pld-cvs-commit mailing list