X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/5dd00edbcf702cac1ea22392796c65881a8ef6f9..4adc750a2a8d0c6b2c03353b5538bc7446020f68:/apt-pkg/algorithms.h diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index 1a9d5aefd..c1a26587d 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -75,8 +75,8 @@ class pkgSimulate : public pkgPackageManager /*{{{*/ Policy iPolicy; pkgDepCache Sim; pkgDepCache::ActionGroup group; - - // The Actuall installation implementation + + // The Actual installation implementation virtual bool Install(PkgIterator Pkg,std::string File) APT_OVERRIDE; virtual bool Configure(PkgIterator Pkg) APT_OVERRIDE; virtual bool Remove(PkgIterator Pkg,bool Purge) APT_OVERRIDE; @@ -124,9 +124,6 @@ class pkgProblemResolver /*{{{*/ APT_HIDDEN void MakeScores(); APT_HIDDEN bool DoUpgrade(pkgCache::PkgIterator Pkg); - APT_HIDDEN bool ResolveInternal(bool const BrokenFix = false); - APT_HIDDEN bool ResolveByKeepInternal(); - protected: bool InstOrNewPolicyBroken(pkgCache::PkgIterator Pkg); @@ -138,9 +135,11 @@ class pkgProblemResolver /*{{{*/ // Try to intelligently resolve problems by installing and removing packages bool Resolve(bool BrokenFix = false, OpProgress * const Progress = NULL); + APT_HIDDEN bool ResolveInternal(bool const BrokenFix = false); // Try to resolve problems only by using keep bool ResolveByKeep(OpProgress * const Progress = NULL); + APT_HIDDEN bool ResolveByKeepInternal(); APT_DEPRECATED_MSG("NOOP as MarkInstall enforces not overriding FromUser markings") void InstallProtect();