diff options
| author | Julian Andres Klode <jak@debian.org> | 2025-10-25 20:49:29 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2025-10-25 20:49:29 +0000 |
| commit | effd872a512beeaee314c2761640ef0b8e973b3d (patch) | |
| tree | 2a0bd97ee32e579cd70dc05fedd096c50871f78b /apt-pkg/depcache.cc | |
| parent | 2698c1e186accebefa320ebacde7ec3c40c66c29 (diff) | |
| parent | a3fca052ca21ad222ac7f2fdd7f3fe84b44beb60 (diff) | |
Merge branch 'solver3' into 'main'
Enable the new solver by default in 0.31, 1.21, 2.11, 3.1
See merge request apt-team/apt!527
Diffstat (limited to 'apt-pkg/depcache.cc')
| -rw-r--r-- | apt-pkg/depcache.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index f7f508f85..09d7a93bc 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1853,6 +1853,10 @@ bool pkgDepCache::IsInstallOkMultiArchSameVersionSynced(PkgIterator const &Pkg, if (CV.Downloadable() == false) continue; + // Ignore siblings marked for deletion + if (PkgState[P->ID].Delete()) + continue; + PkgState[Pkg->ID].iFlags |= AutoKept; if (unlikely(DebugMarker == true)) std::clog << OutputInDepth(Depth) << "Ignore MarkInstall of " << APT::PrettyPkg(this, Pkg) |