From 81804cefd8c24c98e7a0216a9d4277516e19b6e2 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 20 Mar 2025 21:15:14 +0100 Subject: solver3: Do not install new packages for Suggests As a followup to the previous commit, restore the exact behavior of the old solver to break the Suggests on upgrade here by erasing any choices not previously installed. This ensures that the Suggests never installs any new package, but it will still retain previously installed packages when solver3 is doing autoremove. --- test/integration/test-solver3-suggests-last | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) (limited to 'test') diff --git a/test/integration/test-solver3-suggests-last b/test/integration/test-solver3-suggests-last index 1533007b7..9a280eed8 100755 --- a/test/integration/test-solver3-suggests-last +++ b/test/integration/test-solver3-suggests-last @@ -13,32 +13,6 @@ insertpackage 'unstable' 'dhcpd-base' 'all' '2' setupaptarchive -# It seems surprising this does not install avahi-autoipd -testsuccessequal "Reading package lists... -Building dependency tree... -Calculating upgrade... -The following packages will be upgraded: - dhcpd-base -1 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. -Inst dhcpd-base [1] (2 unstable [all]) -Conf dhcpd-base (2 unstable [all])" aptget upgrade -s -q --solver 3.0 - -# Or is it surprising that this does? -for command in "aptget dist-upgrade" "apt upgrade" "apt dist-upgrade"; do -testsuccessequal "Reading package lists... -Building dependency tree... -Calculating upgrade... -The following NEW packages will be installed: - avahi-autoipd -The following packages will be upgraded: - dhcpd-base -1 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. -Inst avahi-autoipd (2 unstable [all]) -Inst dhcpd-base [1] (2 unstable [all]) -Conf avahi-autoipd (2 unstable [all]) -Conf dhcpd-base (2 unstable [all])" $command -s -q --solver 3.0 -done - for command in "aptget upgrade" "aptget dist-upgrade" "apt upgrade" "apt dist-upgrade"; do testsuccessequal "Reading package lists... Building dependency tree... @@ -47,6 +21,6 @@ The following packages will be upgraded: dhcpd-base 1 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. Inst dhcpd-base [1] (2 unstable [all]) -Conf dhcpd-base (2 unstable [all])" $command -s --solver internal -q +Conf dhcpd-base (2 unstable [all])" $command -s -q done -- cgit v1.2.3-70-g09d2