X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/9e7f83533665c03b52dff5809e7ebd93928ea445..b820fd59c4fe6e3581901eee648e88209be56137:/apt-pkg/pkgcachegen.cc

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index f9d8a8b4b..f0b5a982e 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -392,8 +392,21 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator
 	 if (Res > 0)
 	    break;
 	 // Versionstrings are equal - is hash also equal?
-	 if (Res == 0 && List.SameVersion(Hash, Ver) == true)
-	    break;
+	 if (Res == 0)
+	 {
+	    if (List.SameVersion(Hash, Ver) == true)
+	       break;
+	    // sort (volatile) sources above not-sources like the status file
+	    if ((CurrentFile->Flags & pkgCache::Flag::NotSource) == 0)
+	    {
+	       auto VF = Ver.FileList();
+	       for (; VF.end() == false; ++VF)
+		  if (VF.File().Flagged(pkgCache::Flag::NotSource) == false)
+		     break;
+	       if (VF.end() == true)
+		  break;
+	    }
+	 }
 	 // proceed with the next till we have either the right
 	 // or we found another version (which will be lower)
       }