Author: mlschroe Date: Tue Mar 4 19:12:32 2008 New Revision: 9012 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9012&view=rev Log: - fix attribute merge when there's nothing to merge Modified: trunk/sat-solver/src/repodata.c Modified: trunk/sat-solver/src/repodata.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repodata.c?rev=9012&r1=9011&r2=9012&view=diff ============================================================================== --- trunk/sat-solver/src/repodata.c (original) +++ trunk/sat-solver/src/repodata.c Tue Mar 4 19:12:32 2008 @@ -1146,10 +1146,12 @@ } 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); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org