]> git.ipfire.org Git - thirdparty/libsolv.git/commitdiff
Revert "Also consider the buildtime when linking products"
authorMichael Schroeder <mls@suse.de>
Tue, 24 Nov 2015 14:47:51 +0000 (15:47 +0100)
committerMichael Schroeder <mls@suse.de>
Tue, 24 Nov 2015 14:47:51 +0000 (15:47 +0100)
We'll change libzypp instead.
This reverts commit 6afdd003980478664998fbb3de2dd6de3aea2377.

src/linkedpkg.c

index a636db5971cd837f3fc32390676a8c48191fd678..80f269c6df59833fd0aab25354ace42205204377 100644 (file)
@@ -123,7 +123,6 @@ 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;
@@ -161,29 +160,6 @@ 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 */
@@ -209,8 +185,6 @@ 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);
        }
     }