From aaa9e415ce48964726401462767d6038da6d82e7 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 21 May 2024 16:57:56 +0200 Subject: solver3: Actually restore unsolved items rather than solved ones When restoring previously solved items, we try to restore items that have become unsolved again by skipping items that have a solved solution. Well at least we thought we did, but we accidentally had a "not" in there that inverted the meaning, hence we lost work items on backtracking. This mostly did not seem to have caused any issues, I stumbled over it while trying to add `autoremove` listings to `upgrade`, but fixing it also fixes: test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings This used to say "E: Broken packages", meaning the solver lost a non-optional install request and the 2nd stage solver caught an incomplete solution. Also test-bug-735967-lib32-to-i386-unavailable restores the legacy solver behavior, so win win? --- test/integration/solver3.broken | 1 - 1 file changed, 1 deletion(-) (limited to 'test/integration/solver3.broken') diff --git a/test/integration/solver3.broken b/test/integration/solver3.broken index c098b7498..6575b068d 100644 --- a/test/integration/solver3.broken +++ b/test/integration/solver3.broken @@ -27,7 +27,6 @@ test-phased-updates-upgrade test-prevent-markinstall-multiarch-same-versionscrew test-release-candidate-switching test-resolve-by-keep-new-recommends -test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings test-ubuntu-bug-1304403-obsolete-priority-standard test-ubuntu-bug-1990586 test-ubuntu-bug-2025462-phased-dist-upgrade -- cgit v1.2.3-70-g09d2