Author: mlschroe Date: Mon Oct 13 15:32:08 2008 New Revision: 11319 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11319&view=rev Log: - fix order of schema creation Modified: trunk/sat-solver/tools/repo_write.c Modified: trunk/sat-solver/tools/repo_write.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_write.c?rev=11319&r1=11318&r2=11319&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_write.c (original) +++ trunk/sat-solver/tools/repo_write.c Mon Oct 13 15:32:08 2008 @@ -1255,6 +1255,23 @@ cbdata.extraschemata = sat_calloc(repo->nextra, sizeof(Id)); #endif + /* create main schema */ + cbdata.sp = cbdata.schema; + /* collect all other data from all repodatas */ + /* XXX: merge arrays of equal keys? */ + for (j = 0, data = repo->repodata; j < repo->nrepodata; j++, data++) + repodata_search(data, SOLVID_META, 0, repo_write_cb_needed, &cbdata); + sp = cbdata.sp; + /* add solvables if needed */ + if (repo->nsolvables) + { + *sp++ = cbdata.keymap[REPOSITORY_SOLVABLES]; + cbdata.mykeys[cbdata.keymap[REPOSITORY_SOLVABLES]].size++; + } + *sp = 0; + mainschema = addschema(&cbdata, cbdata.schema); + + idarraydata = repo->idarraydata; cbdata.doingsolvables = 1; @@ -1351,22 +1368,6 @@ cbdata.doingsolvables = 0; assert(n == repo->nsolvables); - /* create main schema */ - cbdata.sp = cbdata.schema; - /* collect all other data from all repodatas */ - /* XXX: merge arrays of equal keys? */ - for (j = 0, data = repo->repodata; j < repo->nrepodata; j++, data++) - repodata_search(data, SOLVID_META, 0, repo_write_cb_needed, &cbdata); - sp = cbdata.sp; - /* add solvables if needed */ - if (repo->nsolvables) - { - *sp++ = cbdata.keymap[REPOSITORY_SOLVABLES]; - cbdata.mykeys[cbdata.keymap[REPOSITORY_SOLVABLES]].size++; - } - *sp = 0; - mainschema = addschema(&cbdata, cbdata.schema); - #if 0 if (repo->nextra && anyrepodataused) for (i = -1; i >= -repo->nextra; i--) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org