Author: mlschroe Date: Fri Nov 7 18:16:35 2008 New Revision: 11632 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11632&view=rev Log: - fix solvid setting - make setpos on last element Modified: trunk/sat-solver/src/repodata.c Modified: trunk/sat-solver/src/repodata.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repodata.c?rev=11632&r1=11631&r2=11632&view=diff ============================================================================== --- trunk/sat-solver/src/repodata.c (original) +++ trunk/sat-solver/src/repodata.c Fri Nov 7 18:16:35 2008 @@ -1080,6 +1080,8 @@ di->dp = solvid2data(di->data, di->solvid, &schema); if (!di->dp) goto di_nextrepodata; + if (di->solvid == SOLVID_POS) + di->solvid = di->pool->pos.solvid; /* reset key iterator */ di->keyp = di->data->schemadata + di->data->schemata[schema]; /* FALLTHROUGH */ @@ -1280,7 +1282,7 @@ void dataiterator_setpos(Dataiterator *di) { - if (di->kv.eof) + if (di->kv.eof == 2) { pool_clear_pos(di->pool); return; @@ -1295,7 +1297,7 @@ void dataiterator_setpos_parent(Dataiterator *di) { - if (!di->kv.parent) + if (!di->kv.parent || di->kv.parent->eof == 2) { pool_clear_pos(di->pool); return; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org