From: Michael Schroeder Date: Thu, 25 Oct 2007 17:18:26 +0000 (+0000) Subject: - do not add rules that are always fulfilled X-Git-Tag: BASE-SuSE-Code-12_1-Branch~308^2~891 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=416a19c50cfa63a97ef26895e733a3f883d8d13b;p=thirdparty%2Flibsolv.git - do not add rules that are always fulfilled --- diff --git a/src/pool.c b/src/pool.c index 4ccddc4e..0c0a2796 100644 --- a/src/pool.c +++ b/src/pool.c @@ -401,9 +401,9 @@ pool_queuetowhatprovides(Pool *pool, Queue *q) /******************************************************************************/ /* - * addrangedep + * addrelproviders * - * add RangeDep to whatprovides + * add packages fulfilling the relation to whatprovides array * no exact providers, do range match * */ diff --git a/src/solver.c b/src/solver.c index 059df136..f147b962 100644 --- a/src/solver.c +++ b/src/solver.c @@ -879,6 +879,9 @@ addrulesforsolvable(Solver *solv, Solvable *s, Map *m) printf(">!> !unflag %s-%s.%s[%s]\n", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch), source_name(s->source)); continue; } + + if (*dp == SYSTEMSOLVABLE) /* always installed */ + continue; #if 0 printf("addrule %s-%s.%s %s %d %d\n", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch), dep2str(pool, req), -n, dp - pool->whatprovidesdata); for (i = 0; dp[i]; i++)