]> git.saurik.com Git - apt.git/commitdiff
fix pkgProblemResolver::Scores, thanks to Paul Wise.
authorMichael Vogt <michael.vogt@ubuntu.com>
Tue, 8 Jan 2013 16:56:32 +0000 (17:56 +0100)
committerMichael Vogt <michael.vogt@ubuntu.com>
Tue, 8 Jan 2013 16:56:32 +0000 (17:56 +0100)
Closes: #697577
1  2 
apt-pkg/algorithms.cc

index 8cd9d4c6eacc83f49e444911b395baa21bc4662d,75e914f7dda6e41a7a53478b7aa126089aedd1d8..7fcd9f0db48da4fac460d271659e3524910b11b6
@@@ -550,11 -550,11 +550,14 @@@ void pkgProblemResolver::MakeScores(
     unsigned long Size = Cache.Head().PackageCount;
     memset(Scores,0,sizeof(*Scores)*Size);
  
--   // Important Required Standard Optional Extra
++   // 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)
     int PrioMap[] = {
        0,
-       _config->FindI("pkgProblemResolver::Scores::Important",3),
-       _config->FindI("pkgProblemResolver::Scores::Required",2),
+       _config->FindI("pkgProblemResolver::Scores::Important",2),
+       _config->FindI("pkgProblemResolver::Scores::Required",3),
        _config->FindI("pkgProblemResolver::Scores::Standard",1),
        _config->FindI("pkgProblemResolver::Scores::Optional",-1),
        _config->FindI("pkgProblemResolver::Scores::Extra",-2)