Author: matz Date: Mon Mar 10 16:01:05 2008 New Revision: 9082 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9082&view=rev Log: Store the susetags datadir as an attribute to the product solvable (key "susetags:datadir"). Modified: trunk/sat-solver/tools/repo_content.c trunk/sat-solver/tools/repo_susetags.c Modified: trunk/sat-solver/tools/repo_content.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_content.c?rev=9082&r1=9081&r2=9082&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_content.c (original) +++ trunk/sat-solver/tools/repo_content.c Mon Mar 10 16:01:05 2008 @@ -249,6 +249,8 @@ s->supplements = adddep(pool, &pd, s->supplements, value, 0); else if (istag ("ENHANCES")) s->enhances = adddep(pool, &pd, s->enhances, value, 0); + else if (istag ("DATADIR")) + repo_set_str(repo, s - pool->solvables, str2id(pool, "susetags:datadir", 1), value); /* FRESHENS doesn't seem to exist. */ /* XXX do something about LINGUAS and ARCH? */ #undef istag Modified: trunk/sat-solver/tools/repo_susetags.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_susetags.c?rev=9082&r1=9081&r2=9082&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_susetags.c (original) +++ trunk/sat-solver/tools/repo_susetags.c Mon Mar 10 16:01:05 2008 @@ -432,12 +432,11 @@ Repodata *data = 0; if ((flags & SUSETAGS_EXTEND) && repo->nrepodata) - { - /* use last repodata */ - data = repo->repodata + repo->nrepodata - 1; - indesc = 1; - } - if (!data) + indesc = 1; + if (repo->nrepodata) + /* use last repodata */ + data = repo->repodata + repo->nrepodata - 1; + else data = repo_add_repodata(repo, 0); memset(&pd, 0, sizeof(pd)); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org