]> git.pld-linux.org Git - projects/pld-builder.new.git/commitdiff
Handle 'is obsoleted by'. master
authorArkadiusz Miśkiewicz <arekm@maven.pl>
Wed, 15 May 2024 16:03:18 +0000 (18:03 +0200)
committerArkadiusz Miśkiewicz <arekm@maven.pl>
Wed, 15 May 2024 16:03:18 +0000 (18:03 +0200)
PLD_Builder/install.py

index c1dc671f2829c9d7c70705ccd95332c43e7b8515..d18c207c500db64df1fae17805e39e65a786d531 100644 (file)
@@ -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())
This page took 0.154282 seconds and 4 git commands to generate.