From 9f40a9a3251cc6b51bc50a5fe12c49a45a51aedd Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 2 Nov 2024 13:13:51 +0100 Subject: solver3: Refactor Install(Ver) to PropagateInstall(Ver) This is the first part of changing from Install() to Enqueue() for installs, affecting only the versions. For packages, we still have to resolve the group changing: When propagating cleanly, we don't have the information as to which group the package was part of, hence we are no longer able to queue the version selection of upgrades before obsolete packages, for example, which needs solving. --- apt-pkg/solver3.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apt-pkg/solver3.h') diff --git a/apt-pkg/solver3.h b/apt-pkg/solver3.h index de1bd1e73..0e6d0e2f9 100644 --- a/apt-pkg/solver3.h +++ b/apt-pkg/solver3.h @@ -153,6 +153,8 @@ class Solver bool RejectReverseDependencies(pkgCache::VerIterator Ver); // \brief Enqueue a single or group bool EnqueueOrGroup(pkgCache::DepIterator start, pkgCache::DepIterator end, Var reason); + // \brief Propagate a "true" value of a variable + bool PropagateInstall(Var var); // \brief Propagate a rejection of a variable bool PropagateReject(Var var); // \brief Check if a version is allowed by policy. @@ -186,8 +188,6 @@ class Solver // \brief Mark the package for install. This is annoying as it incurs a decision bool Install(pkgCache::PkgIterator Pkg, Var reason, Group group); - // \brief Install a version. - bool Install(pkgCache::VerIterator Ver, Var reason, Group group); // \brief Apply the selections from the dep cache to the solver bool FromDepCache(pkgDepCache &depcache); -- cgit v1.2.3-70-g09d2