ref: refs/heads/SuSE-Linux-11_0-Branch commit 26a30e66c9e7ad3b538ebabef4095b2bc4f21b2e Author: Michael Schroeder Date: Mon Apr 6 12:15:13 2009 +0200 - fixed name/evr access (bnc#490033) --- tools/repo_rpmmd.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/repo_rpmmd.c b/tools/repo_rpmmd.c index 34be849..dde36df 100644 --- a/tools/repo_rpmmd.c +++ b/tools/repo_rpmmd.c @@ -504,20 +504,19 @@ set_sourcerpm(Repodata *data, Solvable *s, Id handle, char *sourcerpm) return; sevr = p + 1; pool = s->repo->pool; - name = id2str(pool, s->name); - evr = id2str(pool, s->evr); if (!strcmp(sarch, "src.rpm")) repodata_set_constantid(data, handle, SOLVABLE_SOURCEARCH, ARCH_SRC); else if (!strcmp(sarch, "nosrc.rpm")) repodata_set_constantid(data, handle, SOLVABLE_SOURCEARCH, ARCH_NOSRC); else repodata_set_constantid(data, handle, SOLVABLE_SOURCEARCH, strn2id(pool, sarch, strlen(sarch) - 4, 1)); - if (!strncmp(sevr, evr, sarch - sevr - 1) && evr[sarch - sevr - 1] == 0) + evr = id2str(pool, s->evr); + if (evr && !strncmp(sevr, evr, sarch - sevr - 1) && evr[sarch - sevr - 1] == 0) repodata_set_void(data, handle, SOLVABLE_SOURCEEVR); else repodata_set_id(data, handle, SOLVABLE_SOURCEEVR, strn2id(pool, sevr, sarch - sevr - 1, 1)); - if (!strncmp(sourcerpm, name, sevr - sourcerpm - 1) && name[sevr - sourcerpm - - 1] == 0) + name = id2str(pool, s->name); + if (name && !strncmp(sourcerpm, name, sevr - sourcerpm - 1) && name[sevr - sourcerpm - 1] == 0) repodata_set_void(data, handle, SOLVABLE_SOURCENAME); else repodata_set_id(data, handle, SOLVABLE_SOURCENAME, strn2id(pool, sourcerpm, sevr - sourcerpm - 1, 1)); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org