diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-23 08:08:54 +0200 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-23 08:08:54 +0200 |
commit | 3444603f5ff2b4c4816e45e686e06e01df31cdc4 (patch) | |
tree | b0e63e9bc86ca6d39f6987381ca7bfa64e186048 /apt-pkg/orderlist.cc | |
parent | 52d5690b47bd4efe425fa23d9f6559bb44324cd1 (diff) | |
parent | 3278fe66567d149ea92c1afa78941f2bc3c71c85 (diff) |
merged debian-sid branch and resolved conflicts
Diffstat (limited to 'apt-pkg/orderlist.cc')
-rw-r--r-- | apt-pkg/orderlist.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 3a179b2a2..80d8fd490 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -331,9 +331,11 @@ int pkgOrderList::Score(PkgIterator Pkg) } // Important Required Standard Optional Extra - signed short PrioMap[] = {0,5,4,3,1,0}; if (Cache[Pkg].InstVerIter(Cache)->Priority <= 5) + { + signed short PrioMap[] = {0,5,4,3,1,0}; Score += PrioMap[Cache[Pkg].InstVerIter(Cache)->Priority]; + } return Score; } /*}}}*/ |