Author: mlschroe Date: Wed Nov 26 14:53:54 2008 New Revision: 11804 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11804&view=rev Log: - backport patch conflict handling change [bnc#447986] Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/src/solver.c Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-solver/src/solver.c?rev=11804&r1=11803&r2=11804&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/sat-solver/src/solver.c (original) +++ branches/SuSE-Linux-11_0-Branch/sat-solver/src/solver.c Wed Nov 26 14:53:54 2008 @@ -1293,6 +1293,9 @@ if (s->conflicts) { + int ispatch = 0; + if (!strncmp("patch:", id2str(pool, s->name), 6)) + ispatch = 1; conp = s->repo->idarraydata + s->conflicts; /* foreach conflicts of 's' */ while ((con = *conp++) != 0) @@ -1300,6 +1303,8 @@ /* foreach providers of a conflict of 's' */ FOR_PROVIDES(p, pp, con) { + if (ispatch && !pool_match_nevr(pool, pool->solvables + p, con)) + continue; /* dontfix: dont care about conflicts with already installed packs */ if (dontfix && pool->solvables[p].repo == installed) continue; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org