]> git.ipfire.org Git - thirdparty/libsolv.git/commitdiff
conda: take subprio into account for initial sort 384/head
authorWolf Vollprecht <w.vollprecht@gmail.com>
Tue, 19 May 2020 17:33:10 +0000 (19:33 +0200)
committerWolf Vollprecht <w.vollprecht@gmail.com>
Wed, 20 May 2020 03:49:59 +0000 (05:49 +0200)
src/policy.c

index fe8d55e3ce430896f3bc90b2fe0dc21c9681b68b..16b890e8729ce3f6c225a892e4807a696b033668 100644 (file)
@@ -906,10 +906,14 @@ prune_to_best_version(Pool *pool, Queue *plist)
       if (r == 0 && has_package_link(pool, s))
         r = pool_link_evrcmp(pool, best, s);
 #endif
+#ifdef ENABLE_CONDA
+      if (r == 0 && pool->disttype == DISTTYPE_CONDA)
+       r = best->repo->subpriority - s->repo->subpriority;
       if (r == 0 && pool->disttype == DISTTYPE_CONDA)
        r = pool_buildversioncmp(pool, best, s);
       if (r == 0 && pool->disttype == DISTTYPE_CONDA)
        r = pool_buildflavorcmp(pool, best, s);
+#endif
       if (r < 0)
        best = s;
     }