From 613c36dce7b20c482f6adf5f7a8ed59ff49c0d93 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Thu, 1 Aug 2013 21:25:38 +0200
Subject: merge patch from Colin Watson (many thanks!) to Prefer native
 architecture over higher priority for providers

---
 apt-pkg/depcache.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'apt-pkg/depcache.cc')

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;
    }
-- 
cgit v1.2.3