diff options
| author | Julian Andres Klode <jak@debian.org> | 2025-10-26 09:14:20 +0100 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2025-10-26 09:31:20 +0100 |
| commit | 22786e32b613518ae3a5cd07e9e2f1419b2c6552 (patch) | |
| tree | 0bc86830902fe57bbe1b9d2b0f23ab5886885adc /apt-pkg | |
| parent | 487ce0983c2008991566b4cfb269fd7d29a08e98 (diff) | |
Revert "depcache: Allow changing multi-arch versions for removed siblings"
This reverts commit 74636b64a7ee56637a3ce4ddc1d060ca9f8b77e1.
Adjust the test case accordingly, as it is no longer possible to
install libgcc-s1:s390x. We need to sort this out in the ToDepCache
translation layer at a later time.
Sadly the depcache rejects valid solutions like this; solving this
isn't trivial. Technically we need to split up the FromUser and
auto-bit handling to solve this, but even then, MarkDelete() with
FromUser=0 moves the auto-bit on metapackages; this doesn't happen
when doing FromUser=1, so we can't always do FromUser=1.
Fixes: a3fca052ca21ad222ac7f2fdd7f3fe84b44beb60
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/depcache.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 09d7a93bc..f7f508f85 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1853,10 +1853,6 @@ 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) |