apt/apt-pkg/solver3.h, branch 2.9.35Debians commandline package managerhttps://git.kalnischkies.de/apt/atom?h=2.9.352025-03-20T21:22:17Zsolver3: Handle previously satisfied Suggests last2025-03-20T21:22:17ZJulian Andres Klodejulian.klode@canonical.com2025-03-20T19:47:28Zurn:sha1:83bad834c63604035c251f24ee9ea99dac1a1369
In #2103556 we can see that avahi-daemon Suggests avahi-autoipd,
which is previously satisfied by dhcpcd-base due to a Provides;
that Provides has now been dropped; and solver3 keeps the update
back.
As in LP: #2102720 this is a Suggests and it seems wrong for the
Suggests to actually influence dependency choices and be able to
hold back updates.
Instead, satisfy previously satisfied Suggests at the end. For the
particular case in this bug report, this results in avahi-autoipd,
the real package, to be installed to keep the Suggests working
which needs further consideration whether that is the right choice
(we can argue either way), but in any case this is a better solution.
This in turn breaks the conkeror test which is a somewhat awkward
unrealistic test these days as it has no automatically installed
packages; because previously something must have had a Suggests
on say libdatrie1 or something that was processed first.
This would be fine before 5daf6dbfd272be2f8e3c59d4bab4be8c119b7aa1
but as of that commit we no longer rewrite
conkeror Depends xulrunner-1.9 | xulrunner-1.9.1
into
conkeror Depends xulrunner-1.9.1 | xulrunner-1.9
Because xulrunner-1.9 is manually installed. Mark xulrunner-1.9
as automatically installed to fix the test case.
The resulting behavior seems correct: If you manually want
xulrunner-1.9 specifically we should not replace it with
xulrunner-1.9.1; but if it's automatically installed we should.
LP: #2103556
apt-pkg/solver3.h: avoid static_assert(false)2025-03-14T08:29:23ZJohannes Schauer Marin Rodriguesjosch@mister-muffin.de2025-03-12T22:55:05Zurn:sha1:8be7a10b43804fc4ebef712892e45bba26647d1f
With older compilers (g++ and clang from Bookworm), static_assert(false)
will result in:
/home/josch/git/apt/build/include/apt-pkg/solver3.h:52:24: error: static assertion failed: Cannot construct map for key type
52 | static_assert(false, "Cannot construct map for key type");
| ^~~~~
This commit implements the terrible but more valid workaround according to:
https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2022/p2593r0.html
Original solution from here:
https://stackoverflow.com/questions/14637356/static-assert-fails-compilation-even-though-template-function-is-called-nowhere/14637534#14637534
That way, apt will compile with compilers in Bookworm again.
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
solver3: Do not prefer new installs over manually installed obsoletes2025-03-09T13:53:53ZJulian Andres Klodejulian.klode@canonical.com2025-03-09T13:52:53Zurn:sha1:5daf6dbfd272be2f8e3c59d4bab4be8c119b7aa1
Only move obsolete packages last that are automatically installed,
as we don't want to remove manually installed obsolete packages.
Add some missing const annotations to the operator[] arguments as
well that were needed.
LP: #2100247
solver3: Verbose error messages2025-03-08T22:18:05ZJulian Andres Klodejulian.klode@canonical.com2025-03-06T19:07:30Zurn:sha1:3967b75ae4a10d0d79560dfecb8eb210aad4f4f2
Introduce a new function, LongWhyStr() that returns a longer
reason for why something is being installed (or not).
This does the same path walk as the other function does, but
it renders the clauses at each level, and one per line, so
the whole output is a lot more informative.
It is a separate function to keep the existing debug messages
use the simple single line implication graph
We remove the other special case in AddWork() for empty solutions
to mke use of the general case in Solve() instead, and then adapt
the case in Solve() to the same case as in Enqueue(). This also
happens to fix the bug that when we encountered an empty clause
we just printed the clause had no solution, but not how we got
to install the package with the clause.
Adapt the test suite for the changes which is an annoying amount
of paperwork.
solver3: Support pretty printing clauses2025-03-06T19:07:00ZJulian Andres Klodejulian.klode@canonical.com2025-03-06T19:07:00Zurn:sha1:142d6499b51451d57fc050c71ffcfb8338e02b7e
This will print the underlying dependency which is nicer to
read.
solver3: cleanup operators for Var2025-03-06T19:06:40ZJulian Andres Klodejulian.klode@canonical.com2025-03-04T21:23:47Zurn:sha1:7d5fe59c19edf06cbee3e0b34d71032322907ae6
Particularly, use single line and implement operator!=
solver3: refactor: Return inserted Clause in AddWork()2025-03-06T19:06:40ZJulian Andres Klodejulian.klode@canonical.com2025-02-20T11:21:42Zurn:sha1:7194a6b39c2aa6f1006630975a1bf4ffc3c9daf2
This avoids relying on the inserted clause being at the back
of the clauses vector.
solver3: Simplify Var pointer tagging2025-03-06T19:06:40ZJulian Andres Klodejulian.klode@canonical.com2025-02-19T11:30:51Zurn:sha1:56c14eab8f399497295bb74d551dc49a4a763486
Use an integer and tag the lowest bit manually. This makes it
much easier to next convert this into a literal.
Add some constexpr and remove an unnecessary assertion on
CastPkg().
Add missing #include <memory>2025-02-15T15:54:38ZJulian Andres Klodejulian.klode@canonical.com2025-02-15T15:50:57Zurn:sha1:2614ff646e812e2d9515e6f0e7be076e97c9ec1a