Author: matz Date: Sun Nov 25 04:37:25 2007 New Revision: 7910 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7910&view=rev Log: Advancing to the next solvable needs to happen a posteriori. Without this we end up with the first solvable being <NULL>, and we miss the last package. Modified: trunk/sat-solver/tools/repo_rpmmd.c Modified: trunk/sat-solver/tools/repo_rpmmd.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmmd.c?rev... ============================================================================== --- trunk/sat-solver/tools/repo_rpmmd.c (original) +++ trunk/sat-solver/tools/repo_rpmmd.c Sun Nov 25 04:37:25 2007 @@ -280,12 +280,7 @@ } break; case STATE_PACKAGE: - if (pd->numpacks > 0) - { - pd->numpacks--; - pd->solvable++; - } - else + if (pd->numpacks == 0) pd->solvable = pool_id2solvable(pool, repo_add_solvable(pd->repo)); #if 0 fprintf(stderr, "package #%d\n", pd->solvable - pool->solvables); @@ -377,6 +372,11 @@ if (s->arch != ARCH_SRC && s->arch != ARCH_NOSRC) s->provides = repo_addid_dep(pd->repo, s->provides, rel2id(pool, s->name, s->evr, REL_EQ, 1), 0); s->supplements = repo_fix_legacy(pd->repo, s->provides, s->supplements); + if (pd->numpacks > 0) + { + pd->numpacks--; + pd->solvable++; + } break; case STATE_NAME: s->name = str2id(pool, pd->content, 1); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org