From ccdbea353a30de597a00a88cf4c7216370a21882 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 2 Nov 2024 13:54:04 +0100 Subject: solver3: Replace Install() with Enqueue(), and PropagateInstall() Do not enqueue common dependencies if a version is selected already, this avoids test suites changing now in behavior as the ordering is different. --- apt-pkg/solver3.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apt-pkg/solver3.h') diff --git a/apt-pkg/solver3.h b/apt-pkg/solver3.h index c7437f8fb..5c67faff2 100644 --- a/apt-pkg/solver3.h +++ b/apt-pkg/solver3.h @@ -56,6 +56,9 @@ class Solver // try it last. SatisfyObsolete, + // Select a version of a package chosen for install. + SelectVersion, + // My intuition tells me that we should try to schedule upgrades first, then // any non-obsolete installed packages, and only finally obsolete ones, such // that newer packages guide resolution of dependencies for older ones, they @@ -183,9 +186,6 @@ class Solver // Enqueue a decision fact bool Enqueue(Var var, bool decision, Var reason); - // \brief Mark the package for install. This is annoying as it incurs a decision - bool Install(pkgCache::PkgIterator Pkg, Var reason, Group group); - // \brief Apply the selections from the dep cache to the solver bool FromDepCache(pkgDepCache &depcache); // \brief Apply the solver result to the depCache -- cgit v1.2.3-70-g09d2