diff options
author | Michael Vogt <mvo@debian.org> | 2013-08-05 22:51:30 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2013-08-05 22:51:30 +0200 |
commit | afc2891fdac29848826a7f9cdeb22ce0c2409350 (patch) | |
tree | f7c5c2ea862eca5d28bbb4d45181d6f21e60d06f /apt-pkg/depcache.cc | |
parent | 4ccd3b3ce69d6a6598e1773689a44fdec78a85cc (diff) | |
parent | 64876cf7963f897efa70c3e424527e2e8651aa29 (diff) |
Merge remote-tracking branch 'upstream/debian/sid' into bugfix/coverity
Diffstat (limited to 'apt-pkg/depcache.cc')
-rw-r--r-- | apt-pkg/depcache.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 2c6eb43bf..978a893f7 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1007,9 +1007,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) { @@ -1024,6 +1021,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; } |