diff options
Diffstat (limited to 'apt-pkg/algorithms.cc')
| -rw-r--r-- | apt-pkg/algorithms.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 65c5ff85d..95e756c15 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1051,7 +1051,7 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix) } } - // Hm, nothing can possibly satisify this dep. Nuke it. + // Hm, nothing can possibly satisfy this dep. Nuke it. if (VList[0] == 0 && Start.IsNegative() == false && (Flags[I->ID] & Protected) != Protected) @@ -1144,7 +1144,7 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix) pkgCache::PkgIterator I = Cache.PkgBegin(); for (;I.end() != true; ++I) { if (Cache[I].NewInstall() && !(Flags[I->ID] & PreInstalled)) { - if(_config->FindI("Debug::pkgAutoRemove",false)) { + if(_config->FindB("Debug::pkgAutoRemove",false)) { std::clog << "Resolve installed new pkg: " << I.FullName(false) << " (now marking it as auto)" << std::endl; } @@ -1189,7 +1189,7 @@ bool pkgProblemResolver::InstOrNewPolicyBroken(pkgCache::PkgIterator I) /*}}}*/ // ProblemResolver::ResolveByKeep - Resolve problems using keep /*{{{*/ // --------------------------------------------------------------------- -/* This is the work horse of the soft upgrade routine. It is very gental +/* This is the work horse of the soft upgrade routine. It is very gentle in that it does not install or remove any packages. It is assumed that the system was non-broken previously. */ bool pkgProblemResolver::ResolveByKeep(OpProgress * const Progress) @@ -1204,7 +1204,7 @@ bool pkgProblemResolver::ResolveByKeep(OpProgress * const Progress) /*}}}*/ // ProblemResolver::ResolveByKeepInternal - Resolve problems using keep /*{{{*/ // --------------------------------------------------------------------- -/* This is the work horse of the soft upgrade routine. It is very gental +/* This is the work horse of the soft upgrade routine. It is very gentle in that it does not install or remove any packages. It is assumed that the system was non-broken previously. */ bool pkgProblemResolver::ResolveByKeepInternal() @@ -1283,7 +1283,7 @@ bool pkgProblemResolver::ResolveByKeepInternal() continue; /* Hm, the group is broken.. I suppose the best thing to do is to - is to try every combination of keep/not-keep for the set, but thats + is to try every combination of keep/not-keep for the set, but that's slow, and this never happens, just be conservative and assume the list of ors is in preference and keep till it starts to work. */ while (true) @@ -1373,7 +1373,7 @@ void pkgProblemResolver::InstallProtect() /*}}}*/ // PrioSortList - Sort a list of versions by priority /*{{{*/ // --------------------------------------------------------------------- -/* This is ment to be used in conjunction with AllTargets to get a list +/* This is meant to be used in conjunction with AllTargets to get a list of versions ordered by preference. */ struct PrioComp { |