X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fproblems.c;h=063d47be4a214dac36260a36f4745d31318ce2b4;hb=22e701e553344eeb22f88ed0906d76c9a5e39d83;hp=fa2c31b37f6d46b2a768429972857d0839a06052;hpb=538a7f16fd8dc8e98a534d22fb46dbd80e6fd30a;p=platform%2Fupstream%2Flibsolv.git diff --git a/src/problems.c b/src/problems.c index fa2c31b..063d47b 100644 --- a/src/problems.c +++ b/src/problems.c @@ -141,9 +141,9 @@ solver_enableproblem(Solver *solv, Id v) /*------------------------------------------------------------------- * enable weak rules - * + * * Reenable all disabled weak rules (marked in weakrulemap) - * + * */ static void @@ -152,6 +152,8 @@ enableweakrules(Solver *solv) int i; Rule *r; + if (!solv->weakrulemap.size) + return; for (i = 1, r = solv->rules + i; i < solv->learntrules; i++, r++) { if (r->d >= 0) /* already enabled? */ @@ -160,13 +162,17 @@ enableweakrules(Solver *solv) continue; solver_enablerule(solv, r); } + /* make sure broken orphan rules stay disabled */ + if (solv->brokenorphanrules) + for (i = 0; i < solv->brokenorphanrules->count; i++) + solver_disablerule(solv, solv->rules + solv->brokenorphanrules->elements[i]); } /*------------------------------------------------------------------- - * + * * refine_suggestion - * + * * at this point, all rules that led to conflicts are disabled. * we re-enable all rules of a problem set but rule "sug", then * continue to disable more rules until there as again a solution. @@ -223,9 +229,7 @@ refine_suggestion(Solver *solv, Id *problem, Id sug, Queue *refined, int essenti int njob, nfeature, nupdate, pass; queue_empty(&solv->problems); solver_reset(solv); - - if (!solv->problems.count) - solver_run_sat(solv, 0, 0); + solver_run_sat(solv, 0, 0); if (!solv->problems.count) { @@ -556,14 +560,14 @@ solver_prepare_solutions(Solver *solv) idx = solv->solutions.count; queue_push(&solv->solutions, -1); /* unrefined */ /* proofidx stays in position, thus we start with 1 */ - for (i = 1; i < solv->problems.count; i++) - { + for (i = 1; i < solv->problems.count; i++) + { Id p = solv->problems.elements[i]; - queue_push(&solv->solutions, p); - if (p) + queue_push(&solv->solutions, p); + if (p) continue; /* end of problem reached */ - solv->problems.elements[j++] = idx; + solv->problems.elements[j++] = idx; if (i + 1 >= solv->problems.count) break; /* start another problem */ @@ -571,7 +575,7 @@ solver_prepare_solutions(Solver *solv) idx = solv->solutions.count; queue_push(&solv->solutions, -1); /* unrefined */ } - solv->problems.count = j; + solv->problems.count = j; return j / 2; } @@ -584,17 +588,12 @@ create_solutions(Solver *solv, int probnr, int solidx) { Pool *pool = solv->pool; Queue redoq; - Queue problem, solution, problems_save; + Queue problem, solution, problems_save, branches_save, decisionq_reason_save; int i, j, nsol; int essentialok; unsigned int now; int oldmistakes = solv->cleandeps_mistakes ? solv->cleandeps_mistakes->count : 0; Id extraflags = -1; - int decisioncnt_update; - int decisioncnt_keep; - int decisioncnt_resolve; - int decisioncnt_weak; - int decisioncnt_orphan; now = solv_timems(0); queue_init(&redoq); @@ -606,16 +605,19 @@ create_solutions(Solver *solv, int probnr, int solidx) queue_push(&redoq, solv->decisionq_why.elements[i]); queue_push(&redoq, solv->decisionmap[p > 0 ? p : -p]); } - decisioncnt_update = solv->decisioncnt_update; - decisioncnt_keep = solv->decisioncnt_keep; - decisioncnt_resolve = solv->decisioncnt_resolve; - decisioncnt_weak = solv->decisioncnt_weak; - decisioncnt_orphan = solv->decisioncnt_orphan; /* save problems queue */ problems_save = solv->problems; memset(&solv->problems, 0, sizeof(solv->problems)); + /* save branches queue */ + branches_save = solv->problems; + memset(&solv->branches, 0, sizeof(solv->branches)); + + /* save decisionq_reason */ + decisionq_reason_save = solv->decisionq_reason; + memset(&solv->decisionq_reason, 0, sizeof(solv->decisionq_reason)); + /* extract problem from queue */ queue_init(&problem); for (i = solidx + 1; i < solv->solutions.count; i++) @@ -703,16 +705,19 @@ create_solutions(Solver *solv, int probnr, int solidx) solv->decisionmap[p > 0 ? p : -p] = redoq.elements[i + 2]; } queue_free(&redoq); - solv->decisioncnt_update = decisioncnt_update; - solv->decisioncnt_keep = decisioncnt_keep; - solv->decisioncnt_resolve = decisioncnt_resolve; - solv->decisioncnt_weak = decisioncnt_weak; - solv->decisioncnt_orphan = decisioncnt_orphan; + + /* restore decision reasons */ + queue_free(&solv->decisionq_reason); + solv->decisionq_reason = decisionq_reason_save; /* restore problems */ queue_free(&solv->problems); solv->problems = problems_save; + /* restore branches */ + queue_free(&solv->branches); + solv->branches = branches_save; + if (solv->cleandeps_mistakes) { if (oldmistakes) @@ -723,7 +728,7 @@ create_solutions(Solver *solv, int probnr, int solidx) solv->cleandeps_mistakes = solv_free(solv->cleandeps_mistakes); } } - + POOL_DEBUG(SOLV_DEBUG_STATS, "create_solutions for problem #%d took %d ms\n", probnr, solv_timems(now)); } @@ -808,7 +813,7 @@ solver_solutionelement_extrajobflags(Solver *solv, Id problem, Id solution) * pkgid (> 0) pkgid (> 0) * -> add (SOLVER_INSTALL|SOLVER_SOLVABLE, rp) to the job * (this will replace package p) - * + * * Thus, the solver will either ask the application to remove * a specific job from the job queue, or ask to add an install/erase * job to it. @@ -850,7 +855,7 @@ solver_take_solutionelement(Solver *solv, Id p, Id rp, Id extrajobflags, Queue * if (rp <= 0 && p <= 0) return; /* just in case */ if (rp > 0) - p = SOLVER_INSTALL|SOLVER_SOLVABLE|extrajobflags; + p = SOLVER_INSTALL|SOLVER_SOLVABLE|SOLVER_NOTBYUSER|extrajobflags; else { rp = p; @@ -873,7 +878,7 @@ solver_take_solution(Solver *solv, Id problem, Id solution, Queue *job) /*------------------------------------------------------------------- - * + * * find problem rule */ @@ -885,6 +890,7 @@ findproblemrule_internal(Solver *solv, Id idx, Id *reqrp, Id *conrp, Id *sysrp, Rule *r; Id jobassert = 0; int i, reqset = 0; /* 0: unset, 1: installed, 2: jobassert, 3: assert */ + int conset = 0; /* 0: unset, 1: installed */ /* find us a jobassert rule */ for (i = idx; (rid = solv->learnt_pool.elements[i]) != 0; i++) @@ -913,7 +919,7 @@ findproblemrule_internal(Solver *solv, Id idx, Id *reqrp, Id *conrp, Id *sysrp, MAPSET(rseen, rid - solv->learntrules); findproblemrule_internal(solv, solv->learnt_why.elements[rid - solv->learntrules], &lreqr, &lconr, &lsysr, &ljobr, rseen); } - else if ((rid >= solv->jobrules && rid < solv->jobrules_end) || (rid >= solv->infarchrules && rid < solv->infarchrules_end) || (rid >= solv->duprules && rid < solv->duprules_end) || (rid >= solv->bestrules && rid < solv->bestrules_end)) + else if ((rid >= solv->jobrules && rid < solv->jobrules_end) || (rid >= solv->infarchrules && rid < solv->infarchrules_end) || (rid >= solv->duprules && rid < solv->duprules_end) || (rid >= solv->bestrules && rid < solv->bestrules_end) || (rid >= solv->yumobsrules && rid <= solv->yumobsrules_end)) { if (!*jobrp) *jobrp = rid; @@ -925,11 +931,21 @@ findproblemrule_internal(Solver *solv, Id idx, Id *reqrp, Id *conrp, Id *sysrp, } else { - assert(rid < solv->rpmrules_end); + assert(rid < solv->pkgrules_end); r = solv->rules + rid; d = r->d < 0 ? -r->d - 1 : r->d; if (!d && r->w2 < 0) { + /* prefer conflicts of installed packages */ + if (solv->installed && !conset) + { + if (r->p < 0 && (solv->pool->solvables[-r->p].repo == solv->installed || + solv->pool->solvables[-r->w2].repo == solv->installed)) + { + *conrp = rid; + conset = 1; + } + } if (!*conrp) *conrp = rid; } @@ -939,8 +955,11 @@ findproblemrule_internal(Solver *solv, Id idx, Id *reqrp, Id *conrp, Id *sysrp, { if (*reqrp > 0 && r->p < -1) { + Pool *pool = solv->pool; Id op = -solv->rules[*reqrp].p; - if (op > 1 && solv->pool->solvables[op].arch != solv->pool->solvables[-r->p].arch) + if (op > 1 && pool->solvables[op].arch != pool->solvables[-r->p].arch && + pool->solvables[op].arch != pool->noarchid && + pool->solvables[-r->p].arch != pool->noarchid) continue; /* different arch, skip */ } /* prefer assertions */ @@ -974,7 +993,7 @@ findproblemrule_internal(Solver *solv, Id idx, Id *reqrp, Id *conrp, Id *sysrp, *sysrp = lsysr; } -/* +/* * find problem rule * * search for a rule that describes the problem to the @@ -993,6 +1012,28 @@ solver_findproblemrule(Solver *solv, Id problem) map_init(&rseen, solv->learntrules ? solv->nrules - solv->learntrules : 0); findproblemrule_internal(solv, idx, &reqr, &conr, &sysr, &jobr, &rseen); map_free(&rseen); + /* check if the request is about a not-installed package requiring a installed + * package conflicting with the non-installed package. In that case return the conflict */ + if (reqr && conr && solv->installed && solv->rules[reqr].p < 0 && solv->rules[conr].p < 0 && solv->rules[conr].w2 < 0) + { + Pool *pool = solv->pool; + Solvable *s = pool->solvables - solv->rules[reqr].p; + Solvable *s1 = pool->solvables - solv->rules[conr].p; + Solvable *s2 = pool->solvables - solv->rules[conr].w2; + Id cp = 0; + if (s == s1 && s2->repo == solv->installed) + cp = -solv->rules[conr].w2; + else if (s == s2 && s1->repo == solv->installed) + cp = -solv->rules[conr].p; + if (cp && s1->name != s2->name && s->repo != solv->installed) + { + Id p, pp; + Rule *r = solv->rules + reqr; + FOR_RULELITERALS(p, pp, r) + if (p == cp) + return conr; + } + } if (reqr) return reqr; /* some requires */ if (conr) @@ -1066,43 +1107,63 @@ solver_problemruleinfo2str(Solver *solv, SolverRuleinfo type, Id source, Id targ return pool_tmpjoin(pool, "package ", pool_dep2str(pool, dep), " does not exist"); case SOLVER_RULE_JOB_PROVIDED_BY_SYSTEM: return pool_tmpjoin(pool, pool_dep2str(pool, dep), " is provided by the system", 0); - case SOLVER_RULE_RPM: + case SOLVER_RULE_PKG: return "some dependency problem"; - case SOLVER_RULE_RPM_NOT_INSTALLABLE: + case SOLVER_RULE_BEST: + if (source > 0) + return pool_tmpjoin(pool, "cannot install the best update candidate for package ", pool_solvid2str(pool, source), 0); + return "cannot install the best candidate for the job"; + case SOLVER_RULE_PKG_NOT_INSTALLABLE: return pool_tmpjoin(pool, "package ", pool_solvid2str(pool, source), " is not installable"); - case SOLVER_RULE_RPM_NOTHING_PROVIDES_DEP: + case SOLVER_RULE_PKG_NOTHING_PROVIDES_DEP: s = pool_tmpjoin(pool, "nothing provides ", pool_dep2str(pool, dep), 0); return pool_tmpappend(pool, s, " needed by ", pool_solvid2str(pool, source)); - case SOLVER_RULE_RPM_SAME_NAME: + case SOLVER_RULE_PKG_SAME_NAME: s = pool_tmpjoin(pool, "cannot install both ", pool_solvid2str(pool, source), 0); return pool_tmpappend(pool, s, " and ", pool_solvid2str(pool, target)); - case SOLVER_RULE_RPM_PACKAGE_CONFLICT: + case SOLVER_RULE_PKG_CONFLICTS: s = pool_tmpjoin(pool, "package ", pool_solvid2str(pool, source), 0); s = pool_tmpappend(pool, s, " conflicts with ", pool_dep2str(pool, dep)); return pool_tmpappend(pool, s, " provided by ", pool_solvid2str(pool, target)); - case SOLVER_RULE_RPM_PACKAGE_OBSOLETES: + case SOLVER_RULE_PKG_OBSOLETES: s = pool_tmpjoin(pool, "package ", pool_solvid2str(pool, source), 0); s = pool_tmpappend(pool, s, " obsoletes ", pool_dep2str(pool, dep)); return pool_tmpappend(pool, s, " provided by ", pool_solvid2str(pool, target)); - case SOLVER_RULE_RPM_INSTALLEDPKG_OBSOLETES: + case SOLVER_RULE_PKG_INSTALLED_OBSOLETES: s = pool_tmpjoin(pool, "installed package ", pool_solvid2str(pool, source), 0); s = pool_tmpappend(pool, s, " obsoletes ", pool_dep2str(pool, dep)); return pool_tmpappend(pool, s, " provided by ", pool_solvid2str(pool, target)); - case SOLVER_RULE_RPM_IMPLICIT_OBSOLETES: + case SOLVER_RULE_PKG_IMPLICIT_OBSOLETES: s = pool_tmpjoin(pool, "package ", pool_solvid2str(pool, source), 0); s = pool_tmpappend(pool, s, " implicitly obsoletes ", pool_dep2str(pool, dep)); return pool_tmpappend(pool, s, " provided by ", pool_solvid2str(pool, target)); - case SOLVER_RULE_RPM_PACKAGE_REQUIRES: + case SOLVER_RULE_PKG_REQUIRES: s = pool_tmpjoin(pool, "package ", pool_solvid2str(pool, source), " requires "); return pool_tmpappend(pool, s, pool_dep2str(pool, dep), ", but none of the providers can be installed"); - case SOLVER_RULE_RPM_SELF_CONFLICT: + case SOLVER_RULE_PKG_SELF_CONFLICT: s = pool_tmpjoin(pool, "package ", pool_solvid2str(pool, source), " conflicts with "); return pool_tmpappend(pool, s, pool_dep2str(pool, dep), " provided by itself"); + case SOLVER_RULE_YUMOBS: + s = pool_tmpjoin(pool, "both package ", pool_solvid2str(pool, source), " and "); + s = pool_tmpjoin(pool, s, pool_solvid2str(pool, target), " obsolete "); + return pool_tmpappend(pool, s, pool_dep2str(pool, dep), 0); default: return "bad problem rule type"; } } +/* convenience function */ +const char * +solver_problem2str(Solver *solv, Id problem) +{ + Id type, source, target, dep; + Id r = solver_findproblemrule(solv, problem); + if (!r) + return "no problem rule?"; + type = solver_ruleinfo(solv, r, &source, &target, &dep); + return solver_problemruleinfo2str(solv, type, source, target, dep); +} + const char * solver_solutionelement2str(Solver *solv, Id p, Id rp) {