From: Michael Schroeder Date: Mon, 22 Mar 2010 17:48:58 +0000 (+0100) Subject: - dataiterator: reset parent when jumping to a solvid [bnc#589640] X-Git-Tag: BASE-SuSE-Code-12_1-Branch~158^2~33^2~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=565bc60f57a21f3bf650ec938b0056481005c2b0;p=thirdparty%2Flibsolv.git - dataiterator: reset parent when jumping to a solvid [bnc#589640] - bump version, add changelog --- diff --git a/VERSION.cmake b/VERSION.cmake index 9e997aff..5a1fc862 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -46,6 +46,6 @@ SET(LIBSATSOLVER_MAJOR "0") SET(LIBSATSOLVER_MINOR "14") -SET(LIBSATSOLVER_PATCH "16") +SET(LIBSATSOLVER_PATCH "17") -# last released 0.14.16 +# last released 0.14.17 diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes index 0f63986a..9140a921 100644 --- a/package/libsatsolver.changes +++ b/package/libsatsolver.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 22 18:45:42 CET 2010 - mls@suse.de + +- dataiterator: reset parent when jumping to a solvid [bnc#589640] +- 0.14.17 + ------------------------------------------------------------------- Thu Mar 11 22:13:26 CET 2010 - ma@suse.de diff --git a/src/repodata.c b/src/repodata.c index 551d83a9..5b205790 100644 --- a/src/repodata.c +++ b/src/repodata.c @@ -1595,6 +1595,7 @@ void dataiterator_skip_solvable(Dataiterator *di) { di->nparents = 0; + di->kv.parent = 0; di->rootlevel = 0; di->keyname = di->keynames[0]; di->state = di_nextsolvable; @@ -1604,6 +1605,7 @@ void dataiterator_skip_repo(Dataiterator *di) { di->nparents = 0; + di->kv.parent = 0; di->rootlevel = 0; di->keyname = di->keynames[0]; di->state = di_nextrepo; @@ -1613,6 +1615,7 @@ void dataiterator_jump_to_solvid(Dataiterator *di, Id solvid) { di->nparents = 0; + di->kv.parent = 0; di->rootlevel = 0; di->keyname = di->keynames[0]; if (solvid == SOLVID_POS) @@ -1657,6 +1660,7 @@ void dataiterator_jump_to_repo(Dataiterator *di, Repo *repo) { di->nparents = 0; + di->kv.parent = 0; di->rootlevel = 0; di->repo = repo; di->repoid = -1;