Mailinglist Archive: zypp-commit (301 mails)

< Previous Next >
[zypp-commit] r7448 - in /trunk/sat-solver: src/pool.c src/solver.c testsuite/yps.c
  • From: mlschroe@xxxxxxxxxxxxxxxx
  • Date: Fri, 05 Oct 2007 23:19:53 -0000
  • Message-id: <20071005231953.D142D2FD2A@xxxxxxxxxxxxxxxx>
Author: mlschroe
Date: Sat Oct  6 01:19:53 2007
New Revision: 7448

URL: http://svn.opensuse.org/viewcvs/zypp?rev=7448&view=rev
Log:
- don't pass name spaces for now
- don't supplement bad architectures

Modified:
    trunk/sat-solver/src/pool.c
    trunk/sat-solver/src/solver.c
    trunk/sat-solver/testsuite/yps.c

Modified: trunk/sat-solver/src/pool.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.c?rev=7448&r1=7447&r2=7448&view=diff
==============================================================================
--- trunk/sat-solver/src/pool.c (original)
+++ trunk/sat-solver/src/pool.c Sat Oct  6 01:19:53 2007
@@ -336,10 +336,12 @@
        queuepushunique(&plist, p);
       break;
     case REL_NAMESPACE:
+#if 0
       /* unknown namespace, just pass through */
       pp = GET_PROVIDESP(evr, p);
       while ((p = *pp++) != 0)
        queuepush(&plist, p);
+#endif
       break;
     default:
       break;

Modified: trunk/sat-solver/src/solver.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=7448&r1=7447&r2=7448&view=diff
==============================================================================
--- trunk/sat-solver/src/solver.c (original)
+++ trunk/sat-solver/src/solver.c Sat Oct  6 01:19:53 2007
@@ -806,6 +806,10 @@
       if (MAPTST(m, i))
        continue;
       s = pool->solvables + i;
+      if (s->arch == ARCH_SRC || s->arch == ARCH_NOSRC)
+       continue;
+      if (pool->id2arch && (s->arch > pool->lastarch || !pool->id2arch[s->arch]))
+       continue;
       sup = 0;
       if ((supp = s->supplements) != 0)
        {
@@ -1807,6 +1811,8 @@
                    continue;
 
                  if (dq.count > 1)
+                   prune_to_recommended(solv, &dq);
+                 if (dq.count > 1)
                    prune_best_version_arch(pool, &dq);
 #if 0
                  s = pool->solvables + dq.elements[0];
@@ -1969,6 +1975,10 @@
                  s = pool->solvables + i;
                  if (!s->supplements && !s->freshens)
                    continue;
+                 if (s->arch == ARCH_SRC || s->arch == ARCH_NOSRC)
+                   continue;
+                 if (pool->id2arch && (s->arch > pool->lastarch || !pool->id2arch[s->arch]))
+                   continue;
                  if ((supp = s->supplements) != 0)
                    {
                      while ((sup = *supp++) != 0)

Modified: trunk/sat-solver/testsuite/yps.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/yps.c?rev=7448&r1=7447&r2=7448&view=diff
==============================================================================
--- trunk/sat-solver/testsuite/yps.c (original)
+++ trunk/sat-solver/testsuite/yps.c Sat Oct  6 01:19:53 2007
@@ -17,6 +17,7 @@
 #include <string.h>
 
 #include "pool.h"
+#include "poolarch.h"
 #include "source_solv.h"
 #include "solver.h"
 
@@ -73,6 +74,7 @@
   int erase = 0;
 
   pool = pool_create();
+  pool_setarch(pool, "i686");
   pool->verbose = 1;
   queueinit(&job);
 

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages