diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2010-08-27 12:05:55 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-08-27 12:05:55 +0200 |
| commit | 35db2f353975cba35597592f468d20d9aed8619c (patch) | |
| tree | 88d1e326d5a67bc34e3cae31a29c71a4173c3d82 /apt-pkg | |
| parent | 1bb8cd67acb83921ec27a989bcb3c6dd6e0d5786 (diff) | |
* apt-pkg/depcache.cc:
- now that apt-get purge works on 'rc' packages let the MarkDelete
pass this purge forward to the non-pseudo package for pseudos
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/depcache.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 00bf68af1..018b05e65 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1149,7 +1149,7 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge, return; if (DebugMarker == true) - std::clog << OutputInDepth(Depth) << "MarkDelete " << Pkg << " FU=" << FromUser << std::endl; + std::clog << OutputInDepth(Depth) << (rPurge ? "MarkPurge " : "MarkDelete ") << Pkg << " FU=" << FromUser << std::endl; RemoveSizes(Pkg); RemoveStates(Pkg); @@ -1167,6 +1167,15 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge, // if we remove the pseudo package, we also need to remove the "real" if (Pkg->CurrentVer != 0 && Pkg.CurrentVer().Pseudo() == true) MarkDelete(Pkg.Group().FindPkg("all"), rPurge, Depth+1, FromUser); + else if (rPurge == true && Pkg->CurrentVer == 0 && + Pkg->CurrentState != pkgCache::State::NotInstalled && + strcmp(Pkg.Arch(), "all") != 0) + { + PkgIterator const allPkg = Pkg.Group().FindPkg("all"); + if (allPkg.end() == false && allPkg->CurrentVer == 0 && + allPkg->CurrentState != pkgCache::State::NotInstalled) + MarkDelete(allPkg, rPurge, Depth+1, FromUser); + } } /*}}}*/ // DepCache::IsDeleteOk - check if it is ok to remove this package /*{{{*/ |