simplify and remove logs

Author: wolfv

src/policy.c

@@ -78,17 +78,6 @@ prune_to_best_version_sortcmp(const void *ap, const void *bp, void *dp)
     }
   /* sort by repository sub-prio (installed repo handled above) */
   r = (sb->repo ? sb->repo->subpriority : 0) - (sa->repo ? sa->repo->subpriority : 0);
-#ifdef ENABLE_CONDA
-  if (r == 0)
-  {
-    Repodata* ra = repo_last_repodata(sa->repo);
-    Repodata* rb = repo_last_repodata(sb->repo);
-
-    unsigned long long bta = repodata_lookup_num(ra, a, SOLVABLE_BUILDTIME, 0ull);
-    unsigned long long btb = repodata_lookup_num(rb, b, SOLVABLE_BUILDTIME, 0ull);
-    r = bta - btb;
-  }
-#endif
   if (r)
     return r;
   /* no idea about the order, sort by id */
@@ -990,33 +979,13 @@ int check_deps_unequal(Pool* pool, Queue* q1, Queue* q2, Id name)
 {
   Id h1 = 0, h2 = 0;
   int i;
-  Id elem;
 
-  // TODO check if reldep ID is equal if same reldep
-  Reldep* rdep;
   for (i = 0; i < q1->count; ++i)
-  {
-    elem = q1->elements[i];
-    if (!ISRELDEP(elem)) continue;
-    rdep = GETRELDEP(pool, elem);
-
-    if (rdep->name == name)
-    {
-      h1 ^= rdep->evr;
-    }
-  }
+    h1 ^= q1->elements[i];
 
   for (i = 0; i < q2->count; ++i)
-  {
-    elem = q2->elements[i];
-    if (!ISRELDEP(elem)) continue;
-    rdep = GETRELDEP(pool, elem);
+    h2 ^= q2->elements[i];
 
-    if (rdep->name == name)
-    {
-      h2 ^= rdep->evr;
-    }
-  }
   return h1 != h2;
 }
 
@@ -1051,10 +1020,7 @@ Id best_matching(Pool* pool, Queue* q, Id name, int* all_have_trackfeatures)
   }
 
   if (selection.count == 0)
-  {
-    // no matches found ...
     return 0;
-  }
 
   Solvable* best = pool_id2solvable(pool, selection.elements[0]), *stmp;
   int cmp;
@@ -1072,10 +1038,6 @@ Id best_matching(Pool* pool, Queue* q, Id name, int* all_have_trackfeatures)
   {
     stmp = pool_id2solvable(pool, selection.elements[i]);
     cmp = pool_evrcmp(pool, best->evr, stmp->evr, 0);
-    // printf("Comparing: %s vs %s: %d\n", 
-    //   pool_id2str(pool, best->evr),
-    //   pool_id2str(pool, stmp->evr),
-    //   cmp);
     if (cmp < 0) best = stmp;
   }
 
@@ -1087,8 +1049,6 @@ int conda_compare_dependencies(Pool *pool, Solvable *s1, Solvable *s2)
   int i, j, has_seen;
   Queue q1, q2, seen;
 
-  // queue_init(&pkgs_a);
-  // queue_init(&pkgs_b);
   queue_init(&q1);
   queue_init(&q2);
   queue_init(&seen);
@@ -1104,66 +1064,41 @@ int conda_compare_dependencies(Pool *pool, Solvable *s1, Solvable *s2)
     has_seen = 0;
 
     if (!ISRELDEP(x1))
-    {
       continue;
-    }
 
     Reldep* rd1 = GETRELDEP(pool, x1);
     for (j = 0; j < seen.count && has_seen == 0; ++j)
-    {
       if (seen.elements[i] == rd1->name)
         has_seen = 1;
-    }
-    printf("Has seen: %d\n", has_seen);
 
     if (has_seen)
-      {
-        continue;
-      }
+      continue;
 
     // first make sure that deps are different between a & b
     int deps_unequal = check_deps_unequal(pool, &q1, &q2, rd1->name);
-    printf("Deps are unequal: %d\n", deps_unequal);
-    fflush(stdout);
-    if (1)
-    {
-      int ii;
-      for (ii = 0; ii < q1.count; ++ii)
-      {
-        Id elem = q1.elements[ii];
-        if (ISRELDEP(elem) && GETRELDEP(pool, elem)->name == rd1->name)
-        {
-          printf("Reldep: %s\n", pool_dep2str(pool, elem));       
-        }
-      }
-      printf("\nQ2: \n");
-      for (int ii = 0; ii < q2.count; ++ii)
-      {
-        Id elem = q2.elements[ii];
-        if (ISRELDEP(elem) && GETRELDEP(pool, elem)->name == rd1->name)
-        {
-          printf("Reldep: %s\n", pool_dep2str(pool, elem));  
-        }
-      }
-    }
 
     if (!deps_unequal)
       {
-        printf("Deps equal, continue\n");
         queue_push(&seen, rd1->name);
         continue;
       }
 
-      int aht_1, aht_2;
-      Id b1 = best_matching(pool, &q1, rd1->name, &aht_1);
-      Id b2 = best_matching(pool, &q2, rd1->name, &aht_2);
+    int aht_1, aht_2;
+    Id b1 = best_matching(pool, &q1, rd1->name, &aht_1);
+    Id b2 = best_matching(pool, &q2, rd1->name, &aht_2);
 
-      if (aht_1 != aht_2)
-      {
-        comparison_result += (aht_1 - aht_2) * 100;
-      }
+    // one of both is not solvable
+    // add random (high) id here
+    if (b1 == 0 || b2 == 0)
+      continue;
+      // comparison_result += (b1 - b2);
+
+    // if one has deps with track features, and the other does not, downweight
+    // the one with track features
+    if (aht_1 != aht_2)
+      comparison_result += (aht_1 - aht_2) * 100;
 
-      comparison_result += pool_evrcmp(pool, b2, b1, 0);
+    comparison_result += pool_evrcmp(pool, b2, b1, 0);
   }
   return comparison_result;
 }
@@ -1181,9 +1116,20 @@ sort_by_best_dependencies(const void *ap, const void *bp, void *dp)
   sb = pool->solvables + b;
 
   int res = conda_compare_dependencies(pool, sa, sb);
-  printf("Solvable comparison: %s vs %s: %d", pool_solvable2str(pool, sa), 
-    pool_solvable2str(pool, sb),
-    res);
+  if (res == 0)
+  {
+    // no differences, select later build
+    Repodata* ra = repo_last_repodata(sa->repo);
+    Repodata* rb = repo_last_repodata(sb->repo);
+
+    unsigned long long bta = repodata_lookup_num(ra, a, SOLVABLE_BUILDTIME, 0ull);
+    unsigned long long btb = repodata_lookup_num(rb, b, SOLVABLE_BUILDTIME, 0ull);
+    res = btb - bta;
+  }
+
+  POOL_DEBUG(SOLV_DEBUG_POLICY, "Selecting variant [%c] of (a) %s vs (b) %s (score: %d)\n",
+             (res < 0 ? 'a' : 'b'), pool_solvable2str(pool, sa), pool_solvable2str(pool, sb), res);
+
   return res; 
 }