Author: kkaempf Date: Mon Apr 7 18:33:04 2008 New Revision: 9437 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9437&view=rev Log: generate architecture dependencies for the patch->package 'conflicts' relation. Modified: trunk/sat-solver/tools/repo_updateinfoxml.c Modified: trunk/sat-solver/tools/repo_updateinfoxml.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_updateinfoxml.c?rev=9437&r1=9436&r2=9437&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_updateinfoxml.c (original) +++ trunk/sat-solver/tools/repo_updateinfoxml.c Mon Apr 7 18:33:04 2008 @@ -334,7 +334,7 @@ { const char *arch = 0, *name = 0, *src = 0; Id evr = makeevr_atts(pool, pd, atts); /* parse "epoch", "version", "release" */ - Id n; + Id n, a, na; Id rel_id; for (; *atts; atts += 2) { @@ -345,8 +345,13 @@ else if (!strcmp(*atts, "src")) src = atts[1]; } + /* generated Ids for name and arch */ n = str2id(pool, name, 1); - rel_id = rel2id(pool, n, evr, REL_LT, 1); + a = str2id(pool, arch, 1); + /* now combine both to a single Id */ + na = rel2id(pool, n, a, REL_ARCH, 1); + + rel_id = rel2id(pool, na, evr, REL_LT, 1); solvable->conflicts = repo_addid_dep(pd->repo, solvable->conflicts, rel_id, 0); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org