projects
/
platform
/
upstream
/
libsolv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
e1434ad
)
- fix attribute merge when there's nothing to merge
author
Michael Schroeder
<mls@suse.de>
Tue, 4 Mar 2008 18:12:32 +0000
(18:12 +0000)
committer
Michael Schroeder
<mls@suse.de>
Tue, 4 Mar 2008 18:12:32 +0000
(18:12 +0000)
src/repodata.c
patch
|
blob
|
history
diff --git
a/src/repodata.c
b/src/repodata.c
index
95b217e
..
037cf36
100644
(file)
--- 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);
}