Author: mlschroe Date: Fri Apr 11 10:51:51 2008 New Revision: 9522 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9522&view=rev Log: - allow no conflictsmap Modified: trunk/sat-solver/src/solvable.c Modified: trunk/sat-solver/src/solvable.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solvable.c?rev=9522&r1=9521&r2=9522&view=diff ============================================================================== --- trunk/sat-solver/src/solvable.c (original) +++ trunk/sat-solver/src/solvable.c Fri Apr 11 10:51:51 2008 @@ -525,13 +525,16 @@ Id *conp, con; map_init(installedmap, pool->nsolvables); - map_init(conflictsmap, pool->nsolvables); + if (!conflictsmap) + map_init(conflictsmap, pool->nsolvables); for (i = 0; i < installed->count; i++) { p = installed->elements[i]; if (p <= 0) /* makes it work with decisionq */ continue; MAPSET(installedmap, p); + if (!conflictsmap) + continue; s = pool->solvables + p; if (!s->conflicts) continue; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org