summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-08-01 21:25:38 +0200
committerMichael Vogt <mvo@debian.org>2013-08-01 21:25:38 +0200
commit613c36dce7b20c482f6adf5f7a8ed59ff49c0d93 (patch)
tree1dc0792b6d0236ec736961955189dd7500924b47 /apt-pkg
parent1819ccef3c9ac0a6b1a413b89b435b4f7d601afd (diff)
merge patch from Colin Watson (many thanks!) to Prefer native architecture over higher priority for providers
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/depcache.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 9f8422fec..08c1bd809 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -1002,9 +1002,6 @@ struct CompareProviders {
else if ((B->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important)
return true;
}
- // higher priority seems like a good idea
- if (AV->Priority != BV->Priority)
- return AV->Priority > BV->Priority;
// prefer native architecture
if (strcmp(A.Arch(), B.Arch()) != 0)
{
@@ -1019,6 +1016,9 @@ struct CompareProviders {
else if (*a == B.Arch())
return true;
}
+ // higher priority seems like a good idea
+ if (AV->Priority != BV->Priority)
+ return AV->Priority > BV->Priority;
// unable to decideā€¦
return A->ID < B->ID;
}