diff options
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/algorithms.h | 5 | ||||
| -rw-r--r-- | apt-pkg/upgrade.cc | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index 5b0d8fb29..c1a26587d 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -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(); diff --git a/apt-pkg/upgrade.cc b/apt-pkg/upgrade.cc index 8ba48e786..c3be9b64f 100644 --- a/apt-pkg/upgrade.cc +++ b/apt-pkg/upgrade.cc @@ -115,7 +115,7 @@ static bool pkgDistUpgrade(pkgDepCache &Cache, OpProgress * const Progress) } } - bool const success = Fix.Resolve(false, Progress); + bool const success = Fix.ResolveInternal(false); if (Progress != NULL) Progress->Done(); return success; @@ -158,7 +158,7 @@ static bool pkgAllUpgradeNoNewPackages(pkgDepCache &Cache, OpProgress * const Pr Progress->Progress(50); // resolve remaining issues via keep - bool const success = Fix.ResolveByKeep(Progress); + bool const success = Fix.ResolveByKeepInternal(); if (Progress != NULL) Progress->Done(); return success; @@ -218,7 +218,7 @@ static bool pkgAllUpgradeWithNewPackages(pkgDepCache &Cache, OpProgress * const Progress->Progress(60); // resolve remaining issues via keep - bool const success = Fix.ResolveByKeep(Progress); + bool const success = Fix.ResolveByKeepInternal(); if (Progress != NULL) Progress->Done(); return success; |