commit 35159c6d6aa22f84afa19ec50af4fb520ae1a2a2 Author: Arkadiusz MiĆkiewicz <ar...@maven.pl> Date: Wed May 15 15:42:45 2024 +0200
Handle additional conflict lines. PLD_Builder/install.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- diff --git a/PLD_Builder/install.py b/PLD_Builder/install.py index f1818c9..c1dc671 100644 --- a/PLD_Builder/install.py +++ b/PLD_Builder/install.py @@ -190,7 +190,8 @@ def install_br(r, b): # phonon-devel-4.3.1-1.i686 conflicts with qt4-phonon-devel-4.5.0-6.i686 # jdbc-stdext >= 2.0 is required by installed java-struts-1.3.10-1.noarch # jmx is needed by (installed) java-commons-modeler-2.0-1.noarch - rx = re.compile(r".*(conflicts with|is required by|is needed by)( installed| \(installed\)|) (?P<name>[^\s]+)-[^-]+-[^-]+($| .*)") + # poldek: file /usr/include/php/main/php_config.h from install of php82-devel-4:8.2.17-3.x86_64 conflicts with file from package php83-devel-4:8.3.7-1.x86_64 + rx = re.compile(r".*(conflicts with|conflicts with file from package|is required by|is needed by)( installed| \(installed\)|) (?P<name>[^\s]+)-[^-]+-[^-]+($| .*)") conflicting = {} for l in f: b.log_line("poldek: %s" % l.rstrip()) ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/projects/pld-builder.new.git/commitdiff/35159c6d6aa22f84afa19ec50af4fb520ae1a2a2 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit