diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2013-01-08 18:01:40 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2013-01-08 18:01:40 +0100 |
| commit | ca3965066270db678649ffd19479a157d95b429f (patch) | |
| tree | f1a3e5c3902a2eeae89d8624e3eac260768ec100 /apt-pkg/algorithms.cc | |
| parent | cd69e44638498a1092ea8aa23c55f73ebd096b9b (diff) | |
| parent | 9005f08e61abe99d2fa229a32fc3148eba29bf5f (diff) | |
merged lp:~mvo/apt/fix-priority-abi-break
Diffstat (limited to 'apt-pkg/algorithms.cc')
| -rw-r--r-- | apt-pkg/algorithms.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 7fcd9f0db..b2a40add1 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -550,14 +550,12 @@ void pkgProblemResolver::MakeScores() unsigned long Size = Cache.Head().PackageCount; memset(Scores,0,sizeof(*Scores)*Size); - // Maps to pkgCache::State::VerPriority - // which is "Important Required Standard Optional Extra" - // (yes, that is confusing, the order of pkgCache::State::VerPriority - // needs to be adjusted but that requires a ABI break) + // maps to pkgCache::State::VerPriority: + // Required Important Standard Optional Extra int PrioMap[] = { 0, - _config->FindI("pkgProblemResolver::Scores::Important",2), _config->FindI("pkgProblemResolver::Scores::Required",3), + _config->FindI("pkgProblemResolver::Scores::Important",2), _config->FindI("pkgProblemResolver::Scores::Standard",1), _config->FindI("pkgProblemResolver::Scores::Optional",-1), _config->FindI("pkgProblemResolver::Scores::Extra",-2) |