From: Michael Schroeder <mls@suse.de>
Date: Fri, 11 Sep 2020 09:56:46 +0000 (+0200)
Subject: Tweak new conda code a bit
X-Git-Tag: 0.7.15~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=841e464ec6cc0245c057afde255992235fee50a9;p=thirdparty%2Flibsolv.git

Tweak new conda code a bit
---

diff --git a/src/policy.c b/src/policy.c
index d8a56ee1..c02d2373 100644
--- a/src/policy.c
+++ b/src/policy.c
@@ -840,10 +840,7 @@ pool_featurecountcmp(Pool *pool, Solvable *s1, Solvable *s2)
   unsigned int cnt1, cnt2;
   cnt1 = solvable_lookup_count(s1, SOLVABLE_TRACK_FEATURES);
   cnt2 = solvable_lookup_count(s2, SOLVABLE_TRACK_FEATURES);
-  if (cnt1 != cnt2)
-    return cnt1 > cnt2 ? -1 : 1;
-  else
-    return 0;
+  return cnt1 == cnt2 ? 0 : cnt1 > cnt2 ? -1 : 1;
 }
 
 static int
@@ -914,9 +911,7 @@ prune_to_best_version(Pool *pool, Queue *plist)
       r = 0; 
 #ifdef ENABLE_CONDA
       if (pool->disttype == DISTTYPE_CONDA)
-	{
-          r = pool_featurecountcmp(pool, best, s);
-	}
+        r = pool_featurecountcmp(pool, best, s);
 #endif
       if (r == 0)
         r = best->evr != s->evr ? pool_evrcmp(pool, best->evr, s->evr, EVRCMP_COMPARE) : 0;