let apt-key del work better with softlink and single key keyrings

[apt.git] / apt-pkg / depcache.cc

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 2c6eb43bf872859cac2fc1bcc78685985b482a50..978a893f7b856537dda8557ec30c93b9b963da9c 100644 (file)
--- 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;
    }