Author: arekm Date: Thu Feb 19 10:27:19 2009 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
There can be some text after conflicting package name like:
poldek: error: java-sun-jre-1.6.0.11-1.athlon (cap java-sun-jre = 1.6.0.11-1)
conflicts with installed java-gcj-compat-devel-1.0.78-5.athlon (java-sun-jre)
---- Files affected:
pld-builder.new/PLD_Builder:
install.py (1.12 -> 1.13)
---- Diffs:
================================================================
Index: pld-builder.new/PLD_Builder/install.py
diff -u pld-builder.new/PLD_Builder/install.py:1.12
pld-builder.new/PLD_Builder/install.py:1.13
--- pld-builder.new/PLD_Builder/install.py:1.12 Thu Jan 22 21:50:16 2009
+++ pld-builder.new/PLD_Builder/install.py Thu Feb 19 11:27:13 2009
@@ -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.12&r2=1.13&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
