From 8c30b67dae0e2eacdb043a1ce42018092a5e0bd1 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Tue, 4 Mar 2008 18:12:32 +0000 Subject: [PATCH] - fix attribute merge when there's nothing to merge --- src/repodata.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/repodata.c b/src/repodata.c index 95b217e..037cf36 100644 --- a/src/repodata.c +++ b/src/repodata.c @@ -1146,10 +1146,12 @@ fprintf(stderr, "repodata_add_dirstr %d %d %s (%d)\n", entry, dir, str, data->a } void -repodata_merge_attrs (Repodata *data, Id dest, Id src) +repodata_merge_attrs(Repodata *data, Id dest, Id src) { Id *keyp; - for (keyp = data->attrs[src]; *keyp; keyp += 2) + if (dest == src || !(keyp = data->attrs[src])) + return; + for (; *keyp; keyp += 2) repodata_insert_keyid(data, dest, keyp[0], keyp[1], 0); } -- 2.7.4