diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2020-04-26 13:14:43 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2020-04-27 13:47:08 +0200 |
| commit | 76498d46855c88b90316e4369ac32050db9a9d23 (patch) | |
| tree | effc77aff70172f33353885d31ab928cad5b132d /apt-pkg/depcache.h | |
| parent | 0de399391372450d0162b5a09bfca554b2d27c3d (diff) | |
Split up MarkInstall into private helper methods
Should be easier to move the code bits around then and it helps in
documenting a bit what the blocks do and how they interact (or not).
Diffstat (limited to 'apt-pkg/depcache.h')
| -rw-r--r-- | apt-pkg/depcache.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 17d9a9c3c..9f2fc3477 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -51,6 +51,12 @@ class OpProgress; class pkgVersioningSystem; +namespace APT +{ +template <class Container> +class PackageContainer; +using PackageVector = PackageContainer<std::vector<pkgCache::PkgIterator>>; +} // namespace APT class APT_PUBLIC pkgDepCache : protected pkgCache::Namespace { @@ -511,6 +517,12 @@ class APT_PUBLIC pkgDepCache : protected pkgCache::Namespace APT_HIDDEN bool IsModeChangeOk(ModeList const mode, PkgIterator const &Pkg, unsigned long const Depth, bool const FromUser); + + APT_HIDDEN bool MarkInstall_StateChange(PkgIterator const &Pkg, bool AutoInst, bool FromUser); + APT_HIDDEN bool MarkInstall_CollectDependencies(pkgCache::VerIterator const &PV, std::vector<pkgCache::DepIterator> &toInstall, std::vector<pkgCache::DepIterator> &toRemove); + APT_HIDDEN bool MarkInstall_RemoveConflictsIfNotUpgradeable(unsigned long Depth, std::vector<pkgCache::DepIterator> &toRemove, APT::PackageVector &toUpgrade); + APT_HIDDEN bool MarkInstall_UpgradeOrRemoveConflicts(unsigned long Depth, bool const ForceImportantDeps, APT::PackageVector &toUpgrade); + APT_HIDDEN bool MarkInstall_InstallDependencies(PkgIterator const &Pkg, unsigned long Depth, bool const ForceImportantDeps, std::vector<pkgCache::DepIterator> &toInstall, APT::PackageVector *const toMoveAuto); }; #endif |