pld-builder.new: PLD_Builder/install.py - deal with xx is required by insta...
arekm
arekm at pld-linux.org
Wed Apr 8 15:50:12 CEST 2009
Author: arekm Date: Wed Apr 8 13:50:12 2009 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
- deal with xx is required by installed yy case, too
---- Files affected:
pld-builder.new/PLD_Builder:
install.py (1.18 -> 1.19)
---- Diffs:
================================================================
Index: pld-builder.new/PLD_Builder/install.py
diff -u pld-builder.new/PLD_Builder/install.py:1.18 pld-builder.new/PLD_Builder/install.py:1.19
--- pld-builder.new/PLD_Builder/install.py:1.18 Wed Apr 8 15:35:19 2009
+++ pld-builder.new/PLD_Builder/install.py Wed Apr 8 15:50:07 2009
@@ -158,7 +158,8 @@
b.log_line("checking conflicting packages in BRed packages")
f = chroot.popen("poldek --test --noask --caplookup -Q -v --upgrade %s" % br, user = "root")
# phonon-devel-4.3.1-1.i686 conflicts with qt4-phonon-devel-4.5.0-6.i686
- rx = re.compile(r".*conflicts with( installed|) (?P<name>[^\s]+)-[^-]+-[^-]+($| .*)")
+ # jdbc-stdext >= 2.0 is required by installed java-struts-1.3.10-1.noarch
+ rx = re.compile(r".*(conflicts with|is required by)( installed|) (?P<name>[^\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.18&r2=1.19&f=u
More information about the pld-cvs-commit
mailing list