commit 7d3fabcf2ed07e1e56a7da100e91885d3622e3ab
Author: Arkadiusz Miśkiewicz <ar...@maven.pl>
Date: Wed May 15 18:03:18 2024 +0200
Handle 'is obsoleted by'.
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 c1dc671..d18c207 100644
--- a/PLD_Builder/install.py
+++ b/PLD_Builder/install.py
@@ -191,7 +191,8 @@ def install_br(r, b):
# 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
# 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]+)-[^-]+-[^-]+($| .*)")
+ # poldek: php80-devel < 4:8.1 is obsoleted by (installed)
php83-devel-4:8.3.7-1.x86_64
+ rx = re.compile(r".*(conflicts with|conflicts with file from package|is
required by|is obsoleted 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/7d3fabcf2ed07e1e56a7da100e91885d3622e3ab
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
