Author: mlschroe Date: Wed May 14 15:04:02 2008 New Revision: 10084 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10084&view=rev Log: - ignore obsoletes in trivial test for now Modified: trunk/sat-solver/src/pool.c Modified: trunk/sat-solver/src/pool.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.c?rev=10084&r1=10083&r2=10084&view=diff ============================================================================== --- trunk/sat-solver/src/pool.c (original) +++ trunk/sat-solver/src/pool.c Wed May 14 15:04:02 2008 @@ -1344,12 +1344,12 @@ pool_trivial_installable(Pool *pool, Repo *oldinstalled, Map *installedmap, Queue *pkgs, Queue *res) { int i, r, m, did; - Id p, *dp, con, *conp, req, *reqp, obs, *obsp, *pp; + Id p, *dp, con, *conp, req, *reqp; unsigned char *map; Solvable *s; map = sat_calloc(pool->nsolvables, 1); - for (p = 0; p < pool->nsolvables; p++) + for (p = 1; p < pool->nsolvables; p++) { if (!MAPTST(installedmap, p)) continue; @@ -1423,9 +1423,10 @@ if (con) continue; /* found a conflict */ } +#if 0 if (s->repo && s->repo != oldinstalled) { - Id p2; + Id p2, obs, *obsp, *pp; Solvable *s2; if (s->obsoletes) { @@ -1453,6 +1454,7 @@ if (p2) continue; } +#endif if (m != map[p]) { map[p] = m; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org