Author: mlschroe Date: Thu Oct 25 19:18:26 2007 New Revision: 7641 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7641&view=rev Log: - do not add rules that are always fulfilled Modified: trunk/sat-solver/src/pool.c trunk/sat-solver/src/solver.c Modified: trunk/sat-solver/src/pool.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.c?rev=7641&r1=7640&r2=7641&view=diff ============================================================================== --- trunk/sat-solver/src/pool.c (original) +++ trunk/sat-solver/src/pool.c Thu Oct 25 19:18:26 2007 @@ -401,9 +401,9 @@ /******************************************************************************/ /* - * addrangedep + * addrelproviders * - * add RangeDep to whatprovides + * add packages fulfilling the relation to whatprovides array * no exact providers, do range match * */ Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=7641&r1=7640&r2=7641&view=diff ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Thu Oct 25 19:18:26 2007 @@ -879,6 +879,9 @@ 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++) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org