This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "New approach to dependency solving".
The branch, SuSE-Code-11-Branch has been updated
via bbeb422f43503d80b69c0f4a9747208c79dd8ccc (commit)
from 0d2d7db6c66cfad6793ec16e547071a92c507b70 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bbeb422f43503d80b69c0f4a9747208c79dd8ccc
Author: Michael Schroeder
Date: Mon Jan 19 09:25:53 2009 +0100
- speed up dup's unsupported package handling
-----------------------------------------------------------------------
Summary of changes and diff:
src/solver.c | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/solver.c b/src/solver.c
index cd261a0..8c8a9f5 100644
--- a/src/solver.c
+++ b/src/solver.c
@@ -3104,17 +3104,15 @@ run_solver(Solver *solv, int disablerules, int doweak)
if (solv->distupgrade && solv->installed)
{
+ int installedone = 0;
/* let's see if we can install some unsupported package */
POOL_DEBUG(SAT_DEBUG_STATS, "deciding unsupported packages\n");
for (i = 0; i < solv->orphaned.count; i++)
{
p = solv->orphaned.elements[i];
- if (!solv->decisionmap[p])
- break;
- }
- if (i < solv->orphaned.count)
- {
- p = solv->orphaned.elements[i];
+ if (solv->decisionmap[p])
+ continue; /* already decided */
+ olevel = level;
if (solv->distupgrade_removeunsupported)
{
POOL_DEBUG(SAT_DEBUG_STATS, "removing unsupported %s\n", solvable2str(pool, pool->solvables + p));
@@ -3124,9 +3122,13 @@ run_solver(Solver *solv, int disablerules, int doweak)
{
POOL_DEBUG(SAT_DEBUG_STATS, "keeping unsupported %s\n", solvable2str(pool, pool->solvables + p));
level = setpropagatelearn(solv, level, p, 0, 0);
+ installedone = 1;
}
- continue;
+ if (level < olevel)
+ break;
}
+ if (installedone || i < solv->orphaned.count)
+ continue;
}
if (solv->solution_callback)
hooks/post-receive
--
New approach to dependency solving
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
