Mailinglist Archive: zypp-commit (301 mails)

[mlschroe@xxxxxxxxxxxxxxxx]

Author: mlschroe
Date: Mon Oct 15 17:06:01 2007
New Revision: 7540

URL: http://svn.opensuse.org/viewcvs/zypp?rev=7540&view=rev
Log:
add arch filtering for obsoletes data

Modified:
    trunk/sat-solver/src/solver.c

Modified: trunk/sat-solver/src/solver.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=7540&r1=7539&r2=7540&view=diff
==============================================================================
--- trunk/sat-solver/src/solver.c (original)
+++ trunk/sat-solver/src/solver.c Mon Oct 15 17:06:01 2007
@@ -2407,6 +2407,10 @@
       s = pool->solvables + i;
       if ((obsp = s->obsoletes) == 0)
        continue;
+      if (s->arch == ARCH_SRC || s->arch == ARCH_NOSRC)
+        continue;
+      if (pool->id2arch && (s->arch > pool->lastarch || !pool->id2arch[s->arch]))
+       continue;            
       while ((obs = *obsp++) != 0)
         FOR_PROVIDES(p, pp, obs)
          {
@@ -2431,6 +2435,10 @@
       s = pool->solvables + i;
       if ((obsp = s->obsoletes) == 0)
        continue;
+      if (s->arch == ARCH_SRC || s->arch == ARCH_NOSRC)
+        continue;
+      if (pool->id2arch && (s->arch > pool->lastarch || !pool->id2arch[s->arch]))
+       continue;            
       while ((obs = *obsp++) != 0)
         FOR_PROVIDES(p, pp, obs)
          {

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