diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2024-08-01 16:57:28 +0900 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2024-11-02 10:23:15 +0100 |
| commit | cab40edc4040691fcadbddbdee77decf4bf20573 (patch) | |
| tree | e568682a5c08bebc5fe899ff50bd147740c394e4 /apt-pkg/solver3.h | |
| parent | 835fd787c24c496516965eb59fef81cbd1e304cc (diff) | |
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.
Diffstat (limited to 'apt-pkg/solver3.h')
| -rw-r--r-- | apt-pkg/solver3.h | 7 |
1 files changed, 3 insertions, 4 deletions
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 <optional> +#include <queue> #include <vector> #include <apt-pkg/configuration.h> @@ -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); |
