Author: matz Date: Wed Jan 30 03:53:07 2008 New Revision: 8404 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8404&view=rev Log: Use repodata_merge_attrs to implement =Shr again. Currently suboptimal, as the blob data isn't shared in the file (the old attribute store simply copied only ofs/len, the new one creates a new blob for each reference to the same data snippet). Modified: trunk/sat-solver/tools/repo_susetags.c Modified: trunk/sat-solver/tools/repo_susetags.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_susetags.c?rev=8404&r1=8403&r2=8404&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_susetags.c (original) +++ trunk/sat-solver/tools/repo_susetags.c Wed Jan 30 03:53:07 2008 @@ -784,7 +784,7 @@ repodata_set_str(data, last_found_pack, id_messagedel, line + 6); #endif continue; -#if 0 +#if 1 case CTAG('=', 'S', 'h', 'r'): if (last_found_pack >= pd.nshare) { @@ -828,7 +828,12 @@ free (pd.sources[i]); } free (pd.sources); + } +#endif + if (pd.nshare) + { + int i, last_found; last_found = 0; for (i = 0; i < pd.nshare; i++) if (pd.share_with[i]) @@ -860,11 +865,10 @@ } } if (n != repo->end) - merge_attrs (attr, i, last_found); + repodata_merge_attrs (data, i, last_found); } free (pd.share_with); } -#endif if (data) repodata_internalize(data); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org