Author: mlschroe Date: Fri Apr 25 14:42:04 2008 New Revision: 9819 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9819&view=rev Log: - fix anchoring of filelist data - susetags move files added to provides back into filelist - ignore packages.FL for now Modified: trunk/sat-solver/tools/repo_rpmdb.c trunk/sat-solver/tools/repo_rpmmd.c trunk/sat-solver/tools/repo_susetags.c trunk/sat-solver/tools/susetags2solv.c Modified: trunk/sat-solver/tools/repo_rpmdb.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmdb.c?rev=9819&r1=9818&r2=9819&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_rpmdb.c (original) +++ trunk/sat-solver/tools/repo_rpmdb.c Fri Apr 25 14:42:04 2008 @@ -646,6 +646,8 @@ handle = (s - pool->solvables) - repodata->start; handle = repodata_get_handle(repodata, handle); did = repodata_str2dir(repodata, dn[di[i]], 1); + if (!did) + did = repodata_str2dir(repodata, "/", 1); repodata_add_dirstr(repodata, handle, SOLVABLE_FILELIST, did, bn[i]); } } Modified: trunk/sat-solver/tools/repo_rpmmd.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmmd.c?rev=9819&r1=9818&r2=9819&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_rpmmd.c (original) +++ trunk/sat-solver/tools/repo_rpmmd.c Fri Apr 25 14:42:04 2008 @@ -791,8 +791,10 @@ else { p = pd->content; - id = repodata_str2dir(pd->data, "/", 1); + id = 0; } + if (!id) + id = repodata_str2dir(pd->data, "/", 1); repodata_add_dirstr(pd->data, handle, SOLVABLE_FILELIST, id, p); break; // xml store capabilities Modified: trunk/sat-solver/tools/repo_susetags.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_susetags.c?rev=9819&r1=9818&r2=9819&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_susetags.c (original) +++ trunk/sat-solver/tools/repo_susetags.c Fri Apr 25 14:42:04 2008 @@ -388,7 +388,7 @@ { Pool *pool = pd->repo->pool; -#if 0 +#if 1 /* move file provides to filelist */ /* relies on the fact that rpm inserts self-provides at the end */ if (s->provides) @@ -425,6 +425,8 @@ sdup[sp - str] = 0; did = repodata_str2dir(pd->data, sdup, 1); } + if (!did) + did = repodata_str2dir(pd->data, "/", 1); repodata_add_dirstr(pd->data, handle, SOLVABLE_FILELIST, did, sp + 1); *p = 0; } @@ -877,8 +879,6 @@ case CTAG('=', 'F', 'l', 's'): { - if (line[6] != '/') - continue; /* no relative files, please */ char *p = strrchr(line + 6, '/'); Id did; if (p && p != line + 6 && !p[1]) @@ -894,8 +894,10 @@ else { p = line + 6; - did = repodata_str2dir(data, "/", 1); + did = 0; } + if (!did) + did = repodata_str2dir(data, "/", 1); repodata_add_dirstr(data, handle, SOLVABLE_FILELIST, did, p); continue; } Modified: trunk/sat-solver/tools/susetags2solv.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/susetags2solv.c?rev=9819&r1=9818&r2=9819&view=diff ============================================================================== --- trunk/sat-solver/tools/susetags2solv.c (original) +++ trunk/sat-solver/tools/susetags2solv.c Fri Apr 25 14:42:04 2008 @@ -202,6 +202,7 @@ } else if (!strcmp(fn, "packages.FL") || !strcmp(fn, "packages.FL.gz")) { +#if 0 sprintf(fnp, "%s/%s", descrdir, fn); FILE *fp = myfopen(fnp); if (!fp) @@ -211,6 +212,10 @@ } repo_add_susetags(repo, fp, vendor, 0, flags | SUSETAGS_EXTEND); fclose(fp); +#else + /* ignore for now. reactivate when filters work */ + continue; +#endif } else if (!strncmp(fn, "packages.", 9)) { -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org