From cab40edc4040691fcadbddbdee77decf4bf20573 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 1 Aug 2024 16:57:28 +0900 Subject: solver3: Remove the Reject() function, propagate in Enqueue() instead Long term we should have a propagate queue, this is the minimal change to keep the behavior identical, a first step on the road. --- apt-pkg/solver3.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'apt-pkg/solver3.h') diff --git a/apt-pkg/solver3.h b/apt-pkg/solver3.h index 527e6fc22..7954f2f73 100644 --- a/apt-pkg/solver3.h +++ b/apt-pkg/solver3.h @@ -8,6 +8,7 @@ */ #include +#include #include #include @@ -152,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 rejection of a variable + bool PropagateReject(Var var); // \brief Check if a version is allowed by policy. bool IsAllowedVersion(pkgCache::Version *V); @@ -185,10 +188,6 @@ class Solver bool Install(pkgCache::PkgIterator Pkg, Var reason, Group group); // \brief Install a version. bool Install(pkgCache::VerIterator Ver, Var reason, Group group); - // \brief Do not install this package - bool Reject(pkgCache::PkgIterator Pkg, Var reason, Group group); - // \brief Do not install this version. - bool Reject(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