Author: arekm Date: Fri Feb 20 14:16:35 2009 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
- yet one more posibility of conflicts
---- Files affected:
pld-builder.new/PLD_Builder:
install.py (1.13 -> 1.14)
---- Diffs:
================================================================
Index: pld-builder.new/PLD_Builder/install.py
diff -u pld-builder.new/PLD_Builder/install.py:1.13
pld-builder.new/PLD_Builder/install.py:1.14
--- pld-builder.new/PLD_Builder/install.py:1.13 Thu Feb 19 11:27:13 2009
+++ pld-builder.new/PLD_Builder/install.py Fri Feb 20 15:16:30 2009
@@ -107,7 +107,7 @@
% (tmpdir, rpmbuild_opt, b.spec))
# 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$")
+ rx = re.compile(r"\s+([\w-]+)\s+.*conflicts with
[^\s]+-[^-]+-[^-]+\.src($| .*)")
conflicting = {}
for l in f.xreadlines():
m = rx.search(l)
@@ -151,7 +151,7 @@
# 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]+)-[^-]+-[^-]+ .*")
+ 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.13&r2=1.14&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
