Mailinglist Archive: zypp-commit (223 mails)

< Previous Next >
[zypp-commit] r10641 - in /branches/SuSE-Linux-11_0-Branch/sat-solver: src/solver.c testsuite/README.FAILS
  • From: mlschroe@xxxxxxxxxxxxxxxx
  • Date: Tue, 22 Jul 2008 13:22:11 -0000
  • Message-id: <20080722132211.BCD162A1A7@xxxxxxxxxxxxxxxx>
Author: mlschroe
Date: Tue Jul 22 15:22:11 2008
New Revision: 10641

URL: http://svn.opensuse.org/viewcvs/zypp?rev=10641&view=rev
Log:
- resolve job rules before installing system packages [#411086]

Modified:
branches/SuSE-Linux-11_0-Branch/sat-solver/src/solver.c
branches/SuSE-Linux-11_0-Branch/sat-solver/testsuite/README.FAILS

Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/src/solver.c
URL:
http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-solver/src/solver.c?rev=10641&r1=10640&r2=10641&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/sat-solver/src/solver.c (original)
+++ branches/SuSE-Linux-11_0-Branch/sat-solver/src/solver.c Tue Jul 22 15:22:11
2008
@@ -2414,6 +2414,60 @@
}
}

+ if (level < systemlevel)
+ {
+ POOL_DEBUG(SAT_DEBUG_STATS, "resolving job rules\n");
+ for (i = solv->jobrules, r = solv->rules + i; i < solv->jobrules_end;
i++, r++)
+ {
+ Id l;
+ if (r->d < 0) /* ignore disabled rules */
+ continue;
+ queue_empty(&dq);
+ FOR_RULELITERALS(l, dp, r)
+ {
+ if (l < 0)
+ {
+ if (solv->decisionmap[-l] <= 0)
+ break;
+ }
+ else
+ {
+ if (solv->decisionmap[l] > 0)
+ break;
+ if (solv->decisionmap[l] == 0)
+ queue_push(&dq, l);
+ }
+ }
+ if (l || !dq.count)
+ continue;
+ if (!solv->updatesystem && solv->installed && dq.count > 1)
+ {
+ int j, k;
+ for (j = k = 0; j < dq.count; j++)
+ {
+ Solvable *s = pool->solvables + dq.elements[j];
+ if (s->repo == solv->installed)
+ dq.elements[k++] = dq.elements[j];
+ }
+ if (k)
+ dq.count = k;
+ }
+ olevel = level;
+ level = selectandinstall(solv, level, &dq, 0, disablerules);
+ if (level == 0)
+ {
+ queue_free(&dq);
+ return;
+ }
+ if (level <= olevel)
+ break;
+ }
+ systemlevel = level + 1;
+ if (i < solv->jobrules_end)
+ continue;
+ }
+
+
/*
* installed packages
*/
@@ -2521,11 +2575,14 @@
if (level <= olevel)
break;
}
+ systemlevel = level + 1;
if (i < solv->installed->end)
continue;
- systemlevel = level;
}

+ if (level < systemlevel)
+ systemlevel = level;
+
/*
* decide
*/

Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/testsuite/README.FAILS
URL:
http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-solver/testsuite/README.FAILS?rev=10641&r1=10640&r2=10641&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/sat-solver/testsuite/README.FAILS (original)
+++ branches/SuSE-Linux-11_0-Branch/sat-solver/testsuite/README.FAILS Tue Jul
22 15:22:11 2008
@@ -12,9 +12,6 @@
data.libzypp/freshen-tests/exercise-7f-test.xml
installs recommends

-data.libzypp/kernel-tests/kernel_kmp-test.xml
- libzypp does an upgrade of a package needed, mls prefers not to
-
data.libzypp/yast-tests/exercise-02conflict-13-force-test.xml
data.libzypp/yast-tests/exercise-inconsistent6-force-test.xml
data.libzypp/yast-tests/exercise-02conflict-09-force-test.xml

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

< Previous Next >
This Thread
  • No further messages