Revert "Revert "Also consider the buildtime when linking products""

Oh well. I hope they make up their minds at some point.

This reverts commit fa1d0de3e6fa244e47a9e50092a47b1435dc5cc8.

diff --git a/src/linkedpkg.c b/src/linkedpkg.c
index 80f269c6df59833fd0aab25354ace42205204377..a636db5971cd837f3fc32390676a8c48191fd678 100644 (file)
--- a/src/linkedpkg.c
+++ b/src/linkedpkg.c
@@ -123,6 +123,7 @@ find_product_link(Pool *pool, Solvable *s, Id *reqidp, Queue *qr, Id *prvidp, Qu
 {
   Id p, pp, namerelid;
   char *str;
+  unsigned int sbt = 0;
 
   /* search for project requires */
   namerelid = 0;
@@ -160,6 +161,29 @@ find_product_link(Pool *pool, Solvable *s, Id *reqidp, Queue *qr, Id *prvidp, Qu
        continue;
       queue_push(qr, p);
     }
+  if (qr->count > 1)
+    {
+      /* multiple providers. try buildtime filter */
+      sbt = solvable_lookup_num(s, SOLVABLE_BUILDTIME, 0);
+      if (sbt)
+       {
+         unsigned int bt;
+         int i, j;
+         int filterqp = 1;
+         for (i = j = 0; i < qr->count; i++)
+           {
+             bt = solvable_lookup_num(pool->solvables + qr->elements[i], SOLVABLE_BUILDTIME, 0);
+             if (!bt)
+               filterqp = 0;   /* can't filter */
+             if (!bt || bt == sbt)
+               qr->elements[j++] = qr->elements[i];
+           }
+         if (j)
+           qr->count = j;
+         if (!j || !filterqp)
+           sbt = 0;    /* filter failed */
+       }
+    }
   if (!qr->count && s->repo == pool->installed)
     {
       /* oh no! Look up reference file */
@@ -185,6 +209,8 @@ find_product_link(Pool *pool, Solvable *s, Id *reqidp, Queue *qr, Id *prvidp, Qu
          Solvable *ps = pool->solvables + p;
          if (s->name != ps->name || ps->repo != s->repo || ps->arch != s->arch || s->evr != ps->evr)
            continue;
+         if (sbt && solvable_lookup_num(ps, SOLVABLE_BUILDTIME, 0) != sbt)
+           continue;
          queue_push(qp, p);
        }
     }