apt, branch 2.9.33Debians commandline package managerhttps://git.kalnischkies.de/apt/atom?h=2.9.332025-03-12T18:26:07ZRelease 2.9.332025-03-12T18:26:07ZJulian Andres Klodejulian.klode@canonical.com2025-03-12T18:26:07Zurn:sha1:1bc3055b737f2e9732a009026f4fe2a322ef7607Merge branch 'solver3' into 'main'2025-03-12T18:20:22ZJulian Andres Klodejak@debian.org2025-03-12T18:20:22Zurn:sha1:1b9359cdda7c4bc33c4f526218f86634e2602e2d
solver3: Fix Recommends/Suggests vs Enhances confusion
See merge request apt-team/apt!461solver3: Fix test-resolve-by-keep-new-recommend2025-03-12T17:54:25ZJulian Andres Klodejulian.klode@canonical.com2025-03-12T17:47:55Zurn:sha1:460753f991ca42c3c4a5ed494038db76c55e2a08
Reorder the if branches a bit to simplify the understanding
of the promotions, and allow us to keep track of which
dependency existed in the installed version.
Change the rule for promoting new recommends to only promote
new recommends to depends in *upgrade* and not *dist-upgrade*
per the test-resolve-by-keep-new-recommends test case.
This makes some sense: In a dist-upgrade, the solver could
otherwise decide to remove an installed package if both the
following hold:
(1) something needs the upgraded version | something else
(2) the upgraded version is not installable due to unsat recommends
solver3: Fix Recommends/Suggests vs Enhances confusion2025-03-12T17:52:16ZJulian Andres Klodejulian.klode@canonical.com2025-03-12T17:34:48Zurn:sha1:a4ce187b40f3bbd110a7cc35f9a5af5a8b7b0c9e
We accidentally considered an Enhances a reason to keep
a package installed, which of course it is not, fix the
determination of "existing soft dependency" to only include
soft dependencies that should keep a package installed in
the autoremover to solve the issue.
This also fixes edsp/mantic-upgrade-rel-to-2024-05-29.edsp
to not install llvm-13-dev for clang-13 which is an installed
package with no upgrade.
Also ensure we stop after the first match; the DependsList()
is ordered by decreasing priority and we don't want to override
Recommends by Suggests in case a package declares both...
LP: #2101800
test: Fix some weird editing artefact2025-03-12T17:18:17ZJulian Andres Klodejulian.klode@canonical.com2025-03-12T17:17:48Zurn:sha1:5c101b3d4651b2f181ac586b088894cce5008d3bMerge branch 'solver3' into 'main'2025-03-10T22:09:31ZJulian Andres Klodejak@debian.org2025-03-10T22:09:31Zurn:sha1:e7a777ce61efa97f90595be418d757a83483002b
solver3: Various bug fixes
See merge request apt-team/apt!459solver3: Correctly determine 'same' or groups2025-03-10T21:47:39ZJulian Andres Klodejulian.klode@canonical.com2025-03-10T21:05:52Zurn:sha1:8a6b694108f41afd1e6cdba4c91481697f9b3004
We incorrectly used the DependencyData of the first or group
member, however that only checked that the first or group member
was the same and that both either had a next member or not.
solver3: Print correct reason when registering dependency2025-03-10T21:33:51ZJulian Andres Klodejulian.klode@canonical.com2025-03-10T20:24:09Zurn:sha1:de095b76b0562c4648b03406349e9914829e5590
This is relevant when debugging common dependencies.
solver3: Fix detection of satisfied recommends for pkg variables2025-03-10T21:33:51ZJulian Andres Klodejulian.klode@canonical.com2025-03-10T18:19:21Zurn:sha1:ae7e10d189a3749d4220480dbbb1da907eb65f4c
This only worked for version literals lol
edsp: Set Forbid-New-Install/Forbid-Remove: no if other is set2025-03-10T21:33:05ZJulian Andres Klodejulian.klode@canonical.com2025-03-10T17:37:55Zurn:sha1:1fc8e9eee4d6a81f907b399034f6f82da2e98140
The upgrade code may also set Upgrade: yes, and this sets both to
yes, so `apt upgrade` dumps behave like `apt-get upgrade` ones,
which of course is not intentional.
moo