ref: refs/heads/SuSE-Code-11-Branch commit 254ad3b684cc89f13ae66aa5ee68ad9ef2fc72e9 Author: Michael Schroeder Date: Thu Mar 5 14:32:32 2009 +0100 - fix repodata_merge_attrs() function --- VERSION.cmake | 4 ++-- package/libsatsolver.changes | 6 ++++++ src/repodata.c | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 1cfc4c2..b08bdc3 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -46,6 +46,6 @@ SET(LIBSATSOLVER_MAJOR "0") SET(LIBSATSOLVER_MINOR "13") -SET(LIBSATSOLVER_PATCH "5") +SET(LIBSATSOLVER_PATCH "6") -# last released 0.13.5 +# last released 0.13.6 diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes index 203ace7..eef07d8 100644 --- a/package/libsatsolver.changes +++ b/package/libsatsolver.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 5 14:31:14 CET 2009 - mls@suse.de + +- fix repodata_merge_attrs() function +- 0.13.6 + +------------------------------------------------------------------- Mon Mar 2 18:20:22 CET 2009 - mls@suse.de - add solver_trivial_installable() to fix multiversion patches [bnc#480303] diff --git a/src/repodata.c b/src/repodata.c index 96db472..1e54ff6 100644 --- a/src/repodata.c +++ b/src/repodata.c @@ -1955,7 +1955,7 @@ void repodata_merge_attrs(Repodata *data, Id dest, Id src) { Id *keyp; - if (dest == src || !(keyp = data->attrs[src])) + if (dest == src || !(keyp = data->attrs[src - data->start])) return; for (; *keyp; keyp += 2) repodata_insert_keyid(data, dest, keyp[0], keyp[1], 0); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org