From 8218c642342e431d7e69831bd1a6741b40345bf1 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 2 Jun 2020 12:47:12 +0200 Subject: Consider if a fix is successful before claiming it is For protected packages the "Fixing" done via KillList in the ProblemResolver will usually not happen as the state change is not allowed, so the debug message is just confusing and the resolver is needlessly looping here (which might push it over the edge), so if we didn't do our thing successfully here we short-circuit a bit to help the next iteration come to a solution. --- ...bug-960705-propagate-protected-to-satisfied-conflict | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'test') diff --git a/test/integration/test-bug-960705-propagate-protected-to-satisfied-conflict b/test/integration/test-bug-960705-propagate-protected-to-satisfied-conflict index 480b6753e..e793193c3 100755 --- a/test/integration/test-bug-960705-propagate-protected-to-satisfied-conflict +++ b/test/integration/test-bug-960705-propagate-protected-to-satisfied-conflict @@ -28,25 +28,8 @@ Broken init:amd64 PreDepends on systemd-sysv:amd64 < 1 @ii pmR > Added systemd-sysv:amd64 to the remove list Broken init:amd64 PreDepends on sysvinit-core:amd64 < none @un pH > Considering sysvinit-core:amd64 0 as a solution to init:amd64 5100 - Fixing init:amd64 via keep of systemd-sysv:amd64 Ignore MarkKeep of systemd-sysv:amd64 < 1 @ii pmR > as its mode (Delete) is protected Investigating (1) init:amd64 < 1 @ii mK Ib > -Broken init:amd64 PreDepends on systemd-sysv:amd64 < 1 @ii pmR > - Considering systemd-sysv:amd64 0 as a solution to init:amd64 5100 - Added systemd-sysv:amd64 to the remove list -Broken init:amd64 PreDepends on sysvinit-core:amd64 < none @un pH > - Considering sysvinit-core:amd64 0 as a solution to init:amd64 5100 - Fixing init:amd64 via keep of systemd-sysv:amd64 - Ignore MarkKeep of systemd-sysv:amd64 < 1 @ii pmR > as its mode (Delete) is protected -Investigating (2) init:amd64 < 1 @ii mK Ib > -Broken init:amd64 PreDepends on systemd-sysv:amd64 < 1 @ii pmR > - Considering systemd-sysv:amd64 0 as a solution to init:amd64 5100 - Added systemd-sysv:amd64 to the remove list -Broken init:amd64 PreDepends on sysvinit-core:amd64 < none @un pH > - Considering sysvinit-core:amd64 0 as a solution to init:amd64 5100 - Fixing init:amd64 via keep of systemd-sysv:amd64 - Ignore MarkKeep of systemd-sysv:amd64 < 1 @ii pmR > as its mode (Delete) is protected -Investigating (3) init:amd64 < 1 @ii mK Ib > Broken init:amd64 PreDepends on systemd-sysv:amd64 < 1 @ii pmR > Considering systemd-sysv:amd64 5100 as a solution to init:amd64 5100 Broken init:amd64 PreDepends on sysvinit-core:amd64 < none @un pH > -- cgit v1.2.3