X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Frules.c;h=32855e4a1ffd13e60102c90c1d75cd17218f21e6;hb=refs%2Fchanges%2F19%2F94119%2F1;hp=cefae3574917f99a7aefb7da3cddc182831c16e2;hpb=a7875e935f415997ca14e741b06dcc25b6f6359d;p=platform%2Fupstream%2Flibsolv.git diff --git a/src/rules.c b/src/rules.c index cefae35..32855e4 100644 --- a/src/rules.c +++ b/src/rules.c @@ -26,17 +26,19 @@ #include "evr.h" #include "policy.h" #include "solverdebug.h" +#include "linkedpkg.h" +#include "cplxdeps.h" #define RULES_BLOCK 63 -static void addrpmruleinfo(Solver *solv, Id p, Id d, int type, Id dep); +static void addpkgruleinfo(Solver *solv, Id p, Id p2, Id d, int type, Id dep); static void solver_createcleandepsmap(Solver *solv, Map *cleandepsmap, int unneeded); /*------------------------------------------------------------------- * Check if dependency is possible - * + * * mirrors solver_dep_fulfilled but uses map m instead of the decisionmap. - * used in solver_addrpmrulesforweak and solver_createcleandepsmap. + * used in solver_addpkgrulesforweak and solver_createcleandepsmap. */ static inline int @@ -49,17 +51,23 @@ dep_possible(Solver *solv, Id dep, Map *m) { Reldep *rd = GETRELDEP(pool, dep); if (rd->flags >= 8) - { + { + if (rd->flags == REL_COND) + return 1; if (rd->flags == REL_AND) { if (!dep_possible(solv, rd->name, m)) return 0; return dep_possible(solv, rd->evr, m); } + if (rd->flags == REL_OR) + { + if (dep_possible(solv, rd->name, m)) + return 1; + return dep_possible(solv, rd->evr, m); + } if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_SPLITPROVIDES) - return solver_splitprovides(solv, rd->evr); - if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_INSTALLED) - return solver_dep_installed(solv, rd->evr); + return solver_splitprovides(solv, rd->evr, m); } } FOR_PROVIDES(p, pp, dep) @@ -70,6 +78,18 @@ dep_possible(Solver *solv, Id dep, Map *m) return 0; } +static inline int +is_otherproviders_dep(Pool *pool, Id dep) +{ + if (ISRELDEP(dep)) + { + Reldep *rd = GETRELDEP(pool, dep); + if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_OTHERPROVIDERS) + return 1; + } + return 0; +} + /******************************************************************** * * Rule handling @@ -218,165 +238,122 @@ hashrule(Solver *solv, Id p, Id d, int n) /*------------------------------------------------------------------- - * + * */ /* * add rule - * p = direct literal; always < 0 for installed rpm rules - * d, if < 0 direct literal, if > 0 offset into whatprovides, if == 0 rule is assertion (look at p only) - * * * A requires b, b provided by B1,B2,B3 => (-A|B1|B2|B3) * - * p < 0 : pkg id of A - * d > 0 : Offset in whatprovidesdata (list of providers of b) + * p < 0 : pkg id of A + * d > 0 : Offset in whatprovidesdata (list of providers of b) * * A conflicts b, b provided by B1,B2,B3 => (-A|-B1), (-A|-B2), (-A|-B3) - * p < 0 : pkg id of A - * d < 0 : Id of solvable (e.g. B1) + * p < 0 : pkg id of A + * p2 < 0 : Id of solvable (e.g. B1) * - * d == 0: unary rule, assertion => (A) or (-A) + * d == 0, p2 == 0: unary rule, assertion => (A) or (-A) * * Install: p > 0, d = 0 (A) user requested install * Remove: p < 0, d = 0 (-A) user requested remove (also: uninstallable) * Requires: p < 0, d > 0 (-A|B1|B2|...) d: * Updates: p > 0, d > 0 (A|B1|B2|...) d: - * Conflicts: p < 0, d < 0 (-A|-B) either p (conflict issuer) or d (conflict provider) (binary rule) + * Conflicts: p < 0, p2 < 0 (-A|-B) either p (conflict issuer) or d (conflict provider) (binary rule) * also used for obsoletes - * ?: p > 0, d < 0 (A|-B) - * No-op ?: p = 0, d = 0 (null) (used as policy rule placeholder) + * No-op ?: p = 0, d = 0 (null) (used as placeholder in update/feature rules) * * resulting watches: * ------------------ * Direct assertion (no watch needed) --> d = 0, w1 = p, w2 = 0 * Binary rule: p = first literal, d = 0, w2 = second literal, w1 = p * every other : w1 = p, w2 = whatprovidesdata[d]; - * Disabled rule: w1 = 0 * - * always returns a rule for non-rpm rules + * always returns a rule for non-pkg rules */ Rule * -solver_addrule(Solver *solv, Id p, Id d) +solver_addrule(Solver *solv, Id p, Id p2, Id d) { Pool *pool = solv->pool; - Rule *r = 0; - Id *dp = 0; - - int n = 0; /* number of literals in rule - 1 - 0 = direct assertion (single literal) - 1 = binary rule - >1 = - */ - - /* it often happenes that requires lead to adding the same rpm rule - * multiple times, so we prune those duplicates right away to make - * the work for unifyrules a bit easier */ + Rule *r; - if (!solv->rpmrules_end) /* we add rpm rules */ + if (d) { - r = solv->rules + solv->nrules - 1; /* get the last added rule */ - if (r->p == p && r->d == d && (d != 0 || !r->w2)) - return r; + assert(!p2 && d > 0); + if (!pool->whatprovidesdata[d]) + d = 0; + else if (!pool->whatprovidesdata[d + 1]) + { + p2 = pool->whatprovidesdata[d]; + d = 0; + } } - /* - * compute number of literals (n) in rule - */ - - if (d < 0) - { - /* always a binary rule */ - if (p == d) - return 0; /* ignore self conflict */ - n = 1; - } - else if (d > 0) - { - for (dp = pool->whatprovidesdata + d; *dp; dp++, n++) - if (*dp == -p) - return 0; /* rule is self-fulfilling */ - - if (n == 1) /* convert to binary rule */ - d = dp[-1]; - } + /* now we have two cases: + * 1 or 2 literals: d = 0, p, p2 contain the literals + * 3 or more literals: d > 0, p2 == 0, d is offset into whatprovidesdata + */ - if (n == 1 && p > d && !solv->rpmrules_end) + /* it often happenes that requires lead to adding the same pkg rule + * multiple times, so we prune those duplicates right away to make + * the work for unifyrules a bit easier */ + if (!solv->pkgrules_end) /* we add pkg rules */ { - /* smallest literal first so we can find dups */ - n = p; p = d; d = n; /* p <-> d */ - n = 1; /* re-set n, was used as temp var */ + r = solv->rules + solv->nrules - 1; + if (d) + { + Id *dp; + /* check if rule is identical */ + if (r->p == p) + { + Id *dp2; + if (r->d == d) + return r; + dp2 = pool->whatprovidesdata + r->d; + for (dp = pool->whatprovidesdata + d; *dp; dp++, dp2++) + if (*dp != *dp2) + break; + if (*dp == *dp2) + return r; + } + /* check if rule is self-fulfilling */ + for (dp = pool->whatprovidesdata + d; *dp; dp++) + if (*dp == -p) + return 0; /* rule is self-fulfilling */ + } + else + { + if (p2 && p > p2) + { + Id o = p; /* switch p1 and p2 */ + p = p2; + p2 = o; + } + if (r->p == p && !r->d && r->w2 == p2) + return r; + if (p == -p2) + return 0; /* rule is self-fulfilling */ + } } - /* - * check for duplicate - */ - - /* check if the last added rule (r) is exactly the same as what we're looking for. */ - if (r && n == 1 && !r->d && r->p == p && r->w2 == d) - return r; /* binary rule */ - - /* have n-ary rule with same first literal, check other literals */ - if (r && n > 1 && r->d && r->p == p) - { - /* Rule where d is an offset in whatprovidesdata */ - Id *dp2; - if (d == r->d) - return r; - dp2 = pool->whatprovidesdata + r->d; - for (dp = pool->whatprovidesdata + d; *dp; dp++, dp2++) - if (*dp != *dp2) - break; - if (*dp == *dp2) - return r; - } - - /* - * allocate new rule - */ - - /* extend rule buffer */ solv->rules = solv_extend(solv->rules, solv->nrules, 1, sizeof(Rule), RULES_BLOCK); r = solv->rules + solv->nrules++; /* point to rule space */ - - /* - * r = new rule - */ - r->p = p; - if (n == 0) - { - /* direct assertion, no watch needed */ - r->d = 0; - r->w1 = p; - r->w2 = 0; - } - else if (n == 1) - { - /* binary rule */ - r->d = 0; - r->w1 = p; - r->w2 = d; - } - else - { - r->d = d; - r->w1 = p; - r->w2 = pool->whatprovidesdata[d]; - } + r->d = d; + r->w1 = p; + r->w2 = d ? pool->whatprovidesdata[d] : p2; r->n1 = 0; r->n2 = 0; - IF_POOLDEBUG (SOLV_DEBUG_RULE_CREATION) { POOL_DEBUG(SOLV_DEBUG_RULE_CREATION, " Add rule: "); solver_printrule(solv, SOLV_DEBUG_RULE_CREATION, r); } - return r; } + void solver_shrinkrules(Solver *solv, int nrules) { @@ -386,7 +363,7 @@ solver_shrinkrules(Solver *solv, int nrules) /****************************************************************************** *** - *** rpm rule part: create rules representing the package dependencies + *** pkg rule part: create rules representing the package dependencies *** ***/ @@ -422,58 +399,309 @@ makemultiversionconflict(Solver *solv, Id n, Id con) queue_push(&q, p); } if (q.count == 1) - return -n; /* no other package found, generate normal conflict */ - return pool_queuetowhatprovides(pool, &q); + n = 0; /* no other package found, normal conflict handling */ + else + n = pool_queuetowhatprovides(pool, &q); + queue_free(&q); + return n; } static inline void -addrpmrule(Solver *solv, Id p, Id d, int type, Id dep) +addpkgrule(Solver *solv, Id p, Id p2, Id d, int type, Id dep) { if (!solv->ruleinfoq) - solver_addrule(solv, p, d); + solver_addrule(solv, p, p2, d); else - addrpmruleinfo(solv, p, d, type, dep); + addpkgruleinfo(solv, p, p2, d, type, dep); +} + +#ifdef ENABLE_LINKED_PKGS + +static int +addlinks_cmp(const void *ap, const void *bp, void *dp) +{ + Pool *pool = dp; + Id a = *(Id *)ap; + Id b = *(Id *)bp; + Solvable *sa = pool->solvables + a; + Solvable *sb = pool->solvables + b; + if (sa->name != sb->name) + return sa->name - sb->name; + return sa - sb; +} + +static void +addlinks(Solver *solv, Solvable *s, Id req, Queue *qr, Id prv, Queue *qp, Map *m, Queue *workq) +{ + Pool *pool = solv->pool; + int i; + if (!qr->count) + return; + if (qp->count > 1) + solv_sort(qp->elements, qp->count, sizeof(Id), addlinks_cmp, pool); +#if 0 + printf("ADDLINKS %s\n -> %s\n", pool_solvable2str(pool, s), pool_dep2str(pool, req)); + for (i = 0; i < qr->count; i++) + printf(" - %s\n", pool_solvid2str(pool, qr->elements[i])); + printf(" <- %s\n", pool_dep2str(pool, prv)); + for (i = 0; i < qp->count; i++) + printf(" - %s\n", pool_solvid2str(pool, qp->elements[i])); +#endif + + if (qr->count == 1) + addpkgrule(solv, -(s - pool->solvables), qr->elements[0], 0, SOLVER_RULE_PKG_REQUIRES, req); + else + addpkgrule(solv, -(s - pool->solvables), 0, pool_queuetowhatprovides(pool, qr), SOLVER_RULE_PKG_REQUIRES, req); + if (qp->count > 1) + { + int j; + for (i = j = 0; i < qp->count; i = j) + { + Id d = pool->solvables[qp->elements[i]].name; + for (j = i + 1; j < qp->count; j++) + if (d != pool->solvables[qp->elements[j]].name) + break; + d = pool_ids2whatprovides(pool, qp->elements + i, j - i); + for (i = 0; i < qr->count; i++) + addpkgrule(solv, -qr->elements[i], 0, d, SOLVER_RULE_PKG_REQUIRES, prv); + } + } + else if (qp->count) + { + for (i = 0; i < qr->count; i++) + addpkgrule(solv, -qr->elements[i], qp->elements[0], 0, SOLVER_RULE_PKG_REQUIRES, prv); + } + if (!m) + return; /* nothing more to do if called from getpkgruleinfos() */ + for (i = 0; i < qr->count; i++) + if (!MAPTST(m, qr->elements[i])) + queue_push(workq, qr->elements[i]); + for (i = 0; i < qp->count; i++) + if (!MAPTST(m, qp->elements[i])) + queue_push(workq, qp->elements[i]); + if (solv->installed && s->repo == solv->installed) + { + Repo *installed = solv->installed; + /* record installed buddies */ + if (!solv->instbuddy) + solv->instbuddy = solv_calloc(installed->end - installed->start, sizeof(Id)); + if (qr->count == 1) + solv->instbuddy[s - pool->solvables - installed->start] = qr->elements[0]; + for (i = 0; i < qr->count; i++) + { + Id p = qr->elements[i]; + if (pool->solvables[p].repo != installed) + continue; /* huh? */ + if (qp->count > 1 || (solv->instbuddy[p - installed->start] != 0 && solv->instbuddy[p - installed->start] != s - pool->solvables)) + solv->instbuddy[p - installed->start] = 1; /* 1: ambiguous buddy */ + else + solv->instbuddy[p - installed->start] = s - pool->solvables; + } + } +} + +static void +add_package_link(Solver *solv, Solvable *s, Map *m, Queue *workq) +{ + Queue qr, qp; + Id req = 0, prv = 0; + queue_init(&qr); + queue_init(&qp); + find_package_link(solv->pool, s, &req, &qr, &prv, &qp); + if (qr.count) + addlinks(solv, s, req, &qr, prv, &qp, m, workq); + queue_free(&qr); + queue_free(&qp); +} + +#endif + +#ifdef ENABLE_COMPLEX_DEPS + +static void +add_complex_deprules(Solver *solv, Id p, Id dep, int type, int dontfix, Queue *workq, Map *m) +{ + Pool *pool = solv->pool; + Repo *installed = solv->installed; + int i, j, flags; + Queue bq; + + queue_init(&bq); + flags = dontfix ? CPLXDEPS_DONTFIX : 0; + /* CNF expansion for requires, DNF + INVERT expansion for conflicts */ + if (type == SOLVER_RULE_PKG_CONFLICTS) + flags |= CPLXDEPS_TODNF | CPLXDEPS_EXPAND | CPLXDEPS_INVERT; + + i = pool_normalize_complex_dep(pool, dep, &bq, flags); + /* handle special cases */ + if (i == 0) + { + if (dontfix) + { + POOL_DEBUG(SOLV_DEBUG_RULE_CREATION, "ignoring broken dependency %s of installed package %s\n", pool_dep2str(pool, dep), pool_solvid2str(pool, p)); + } + else + { + POOL_DEBUG(SOLV_DEBUG_RULE_CREATION, "package %s [%d] is not installable (%s)\n", pool_solvid2str(pool, p), p, pool_dep2str(pool, dep)); + addpkgrule(solv, -p, 0, 0, type == SOLVER_RULE_PKG_REQUIRES ? SOLVER_RULE_PKG_NOTHING_PROVIDES_DEP : type, dep); + } + queue_free(&bq); + return; + } + if (i == 1) + { + queue_free(&bq); + return; + } + + /* go through all blocks and add a rule for each block */ + for (i = 0; i < bq.count; i++) + { + if (!bq.elements[i]) + continue; /* huh? */ + if (bq.elements[i] == pool->nsolvables) + { + /* conventional requires (cannot be a conflicts as they have been expanded) */ + Id *dp = pool->whatprovidesdata + bq.elements[i + 1]; + i += 2; + if (dontfix) + { + for (j = 0; dp[j] != 0; j++) + if (pool->solvables[dp[j]].repo == installed) + break; /* provider was installed */ + if (!dp[j]) + continue; + } + /* check if the rule contains both p and -p */ + for (j = 0; dp[j] != 0; j++) + if (dp[j] == p) + break; + if (dp[j]) + continue; + addpkgrule(solv, -p, 0, dp - pool->whatprovidesdata, SOLVER_RULE_PKG_REQUIRES, dep); + /* push all non-visited providers on the work queue */ + if (m) + for (; *dp; dp++) + if (!MAPTST(m, *dp)) + queue_push(workq, *dp); + continue; + } + if (!bq.elements[i + 1]) + { + Id p2 = bq.elements[i++]; + /* simple rule with just two literals, we'll add a (-p, p2) rule */ + if (dontfix) + { + if (p2 < 0 && pool->solvables[-p2].repo == installed) + continue; + if (p2 > 0 && pool->solvables[p2].repo != installed) + continue; + } + if (-p == p2) + { + if (type == SOLVER_RULE_PKG_CONFLICTS) + { + if (pool->forbidselfconflicts && !is_otherproviders_dep(pool, dep)) + addpkgrule(solv, -p, 0, 0, SOLVER_RULE_PKG_SELF_CONFLICT, dep); + continue; + } + addpkgrule(solv, -p, 0, 0, type, dep); + continue; + } + /* check if the rule contains both p and -p */ + if (p == p2) + continue; + addpkgrule(solv, -p, p2, 0, type, dep); + if (m && p2 > 0 && !MAPTST(m, p2)) + queue_push(workq, p2); + } + else + { + Id *qele; + int qcnt; + + qele = bq.elements + i; + qcnt = i; + while (bq.elements[i]) + i++; + qcnt = i - qcnt; + if (dontfix) + { + for (j = 0; j < qcnt; j++) + { + if (qele[j] > 0 && pool->solvables[qele[j]].repo == installed) + break; + if (qele[j] < 0 && pool->solvables[-qele[j]].repo != installed) + break; + } + if (j == qcnt) + continue; + } + /* add -p to (ordered) rule (overwriting the trailing zero) */ + for (j = 0; ; j++) + { + if (j == qcnt || qele[j] > -p) + { + if (j < qcnt) + memmove(qele + j + 1, qele + j, (qcnt - j) * sizeof(Id)); + qele[j] = -p; + qcnt++; + break; + } + if (qele[j] == -p) + break; + } + /* check if the rule contains both p and -p */ + for (j = 0; j < qcnt; j++) + if (qele[j] == p) + break; + if (j < qcnt) + continue; + addpkgrule(solv, qele[0], 0, pool_ids2whatprovides(pool, qele + 1, qcnt - 1), type, dep); + if (m) + for (j = 0; j < qcnt; j++) + if (qele[j] > 0 && !MAPTST(m, qele[j])) + queue_push(workq, qele[j]); + } + } + queue_free(&bq); } +#endif + /*------------------------------------------------------------------- - * - * add (install) rules for solvable - * + * + * add dependency rules for solvable + * * s: Solvable for which to add rules * m: m[s] = 1 for solvables which have rules, prevent rule duplication - * + * * Algorithm: 'visit all nodes of a graph'. The graph nodes are * solvables, the edges their dependencies. * Starting from an installed solvable, this will create all rules * representing the graph created by the solvables dependencies. - * + * * for unfulfilled requirements, conflicts, obsoletes,.... * add a negative assertion for solvables that are not installable - * + * * It will also create rules for all solvables referenced by 's' * i.e. descend to all providers of requirements of 's' * */ void -solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m) +solver_addpkgrulesforsolvable(Solver *solv, Solvable *s, Map *m) { Pool *pool = solv->pool; Repo *installed = solv->installed; - /* 'work' queue. keeps Ids of solvables we still have to work on. - And buffer for it. */ - Queue workq; + Queue workq; /* list of solvables we still have to work on */ Id workqbuf[64]; - + Queue prereqq; /* list of pre-req ids to ignore */ + Id prereqbuf[16]; + int i; - /* if to add rules for broken deps ('rpm -V' functionality) - * 0 = yes, 1 = no - */ - int dontfix; - /* Id var and pointer for each dependency - * (not used in parallel) - */ + int dontfix; /* ignore dependency errors for installed solvables */ Id req, *reqp; Id con, *conp; Id obs, *obsp; @@ -486,6 +714,8 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m) queue_init_buffer(&workq, workqbuf, sizeof(workqbuf)/sizeof(*workqbuf)); queue_push(&workq, s - pool->solvables); /* push solvable Id to work queue */ + queue_init_buffer(&prereqq, prereqbuf, sizeof(prereqbuf)/sizeof(*prereqbuf)); + /* loop until there's no more work left */ while (workq.count) { @@ -502,40 +732,33 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m) MAPSET(m, n); /* mark as visited */ } - s = pool->solvables + n; /* s = Solvable in question */ + s = pool->solvables + n; dontfix = 0; if (installed /* Installed system available */ && s->repo == installed /* solvable is installed */ - && !solv->fixmap_all /* NOT repair errors in rpm dependency graph */ + && !solv->fixmap_all /* NOT repair errors in dependency graph */ && !(solv->fixmap.size && MAPTST(&solv->fixmap, n - installed->start))) { - dontfix = 1; /* dont care about broken rpm deps */ + dontfix = 1; /* dont care about broken deps */ } if (!dontfix) { if (s->arch == ARCH_SRC || s->arch == ARCH_NOSRC - ? pool_disabled_solvable(pool, s) + ? pool_disabled_solvable(pool, s) : !pool_installable(pool, s)) { - POOL_DEBUG(SOLV_DEBUG_RULE_CREATION, "package %s [%d] is not installable\n", pool_solvable2str(pool, s), (Id)(s - pool->solvables)); - addrpmrule(solv, -n, 0, SOLVER_RULE_RPM_NOT_INSTALLABLE, 0); + POOL_DEBUG(SOLV_DEBUG_RULE_CREATION, "package %s [%d] is not installable\n", pool_solvid2str(pool, n), n); + addpkgrule(solv, -n, 0, 0, SOLVER_RULE_PKG_NOT_INSTALLABLE, 0); } } - /* yet another SUSE hack, sigh */ - if (pool->nscallback && !strncmp("product:", pool_id2str(pool, s->name), 8)) - { - Id buddy = pool->nscallback(pool, pool->nscallbackdata, NAMESPACE_PRODUCTBUDDY, n); - if (buddy > 0 && buddy != SYSTEMSOLVABLE && buddy != n && buddy < pool->nsolvables) - { - addrpmrule(solv, n, -buddy, SOLVER_RULE_RPM_PACKAGE_REQUIRES, solvable_selfprovidedep(pool->solvables + n)); - addrpmrule(solv, buddy, -n, SOLVER_RULE_RPM_PACKAGE_REQUIRES, solvable_selfprovidedep(pool->solvables + buddy)); - if (m && !MAPTST(m, buddy)) - queue_push(&workq, buddy); - } - } +#ifdef ENABLE_LINKED_PKGS + /* add pseudo-package <-> real-package links */ + if (has_package_link(pool, s)) + add_package_link(solv, s, m, &workq); +#endif /*----------------------------------------- * check requires of s @@ -543,11 +766,42 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m) if (s->requires) { + int filterpre = 0; reqp = s->repo->idarraydata + s->requires; while ((req = *reqp++) != 0) /* go through all requires */ { if (req == SOLVABLE_PREREQMARKER) /* skip the marker */ - continue; + { + if (installed && s->repo == installed) + { + if (prereqq.count) + queue_empty(&prereqq); + solvable_lookup_idarray(s, SOLVABLE_PREREQ_IGNOREINST, &prereqq); + filterpre = prereqq.count; + } + continue; + } + if (filterpre) + { + /* check if this id is filtered. assumes that prereqq.count is small */ + for (i = 0; i < prereqq.count; i++) + if (req == prereqq.elements[i]) + break; + if (i < prereqq.count) + { + POOL_DEBUG(SOLV_DEBUG_RULE_CREATION, "package %s: ignoring filtered pre-req dependency %s\n", pool_solvable2str(pool, s), pool_dep2str(pool, req)); + continue; + } + } + +#ifdef ENABLE_COMPLEX_DEPS + if (pool_is_complex_dep(pool, req)) + { + /* we have AND/COND deps, normalize */ + add_complex_deprules(solv, n, req, SOLVER_RULE_PKG_REQUIRES, dontfix, &workq, m); + continue; + } +#endif /* find list of solvables providing 'req' */ dp = pool_whatprovides_ptr(pool, req); @@ -561,16 +815,12 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m) * that are already broken. so if we find one provider * that was already installed, we know that the * dependency was not broken before so we enforce it */ - - /* check if any of the providers for 'req' is installed */ for (i = 0; (p = dp[i]) != 0; i++) - { - if (pool->solvables[p].repo == installed) - break; /* provider was installed */ - } - /* didn't find an installed provider: previously broken dependency */ + if (pool->solvables[p].repo == installed) + break; /* found installed provider */ if (!p) { + /* didn't find an installed provider: previously broken dependency */ POOL_DEBUG(SOLV_DEBUG_RULE_CREATION, "ignoring broken requires %s of installed package %s\n", pool_dep2str(pool, req), pool_solvable2str(pool, s)); continue; } @@ -578,12 +828,17 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m) if (!*dp) { - /* nothing provides req! */ - POOL_DEBUG(SOLV_DEBUG_RULE_CREATION, "package %s [%d] is not installable (%s)\n", pool_solvable2str(pool, s), (Id)(s - pool->solvables), pool_dep2str(pool, req)); - addrpmrule(solv, -n, 0, SOLVER_RULE_RPM_NOTHING_PROVIDES_DEP, req); + POOL_DEBUG(SOLV_DEBUG_RULE_CREATION, "package %s [%d] is not installable (%s)\n", pool_solvid2str(pool, n), n, pool_dep2str(pool, req)); + addpkgrule(solv, -n, 0, 0, SOLVER_RULE_PKG_NOTHING_PROVIDES_DEP, req); continue; } + for (i = 0; dp[i] != 0; i++) + if (n == dp[i]) + break; + if (dp[i]) + continue; /* provided by itself, no need to add rule */ + IF_POOLDEBUG (SOLV_DEBUG_RULE_CREATION) { POOL_DEBUG(SOLV_DEBUG_RULE_CREATION," %s requires %s\n", pool_solvable2str(pool, s), pool_dep2str(pool, req)); @@ -593,22 +848,15 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m) /* add 'requires' dependency */ /* rule: (-requestor|provider1|provider2|...|providerN) */ - addrpmrule(solv, -n, dp - pool->whatprovidesdata, SOLVER_RULE_RPM_PACKAGE_REQUIRES, req); + addpkgrule(solv, -n, 0, dp - pool->whatprovidesdata, SOLVER_RULE_PKG_REQUIRES, req); - /* descend the dependency tree - push all non-visited providers on the work queue */ + /* push all non-visited providers on the work queue */ if (m) - { - for (; *dp; dp++) - { - if (!MAPTST(m, *dp)) - queue_push(&workq, *dp); - } - } - - } /* while, requirements of n */ - - } /* if, requirements */ + for (; *dp; dp++) + if (!MAPTST(m, *dp)) + queue_push(&workq, *dp); + } + } /* that's all we check for src packages */ if (s->arch == ARCH_SRC || s->arch == ARCH_NOSRC) @@ -634,6 +882,14 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m) /* foreach conflicts of 's' */ while ((con = *conp++) != 0) { +#ifdef ENABLE_COMPLEX_DEPS + if (!ispatch && pool_is_complex_dep(pool, con)) + { + /* we have AND/COND deps, normalize */ + add_complex_deprules(solv, n, con, SOLVER_RULE_PKG_CONFLICTS, dontfix, &workq, m); + continue; + } +#endif /* foreach providers of a conflict of 's' */ FOR_PROVIDES(p, pp, con) { @@ -642,24 +898,27 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m) /* dontfix: dont care about conflicts with already installed packs */ if (dontfix && pool->solvables[p].repo == installed) continue; - /* p == n: self conflict */ - if (p == n && pool->forbidselfconflicts) + if (p == n) /* p == n: self conflict */ { - if (ISRELDEP(con)) - { - Reldep *rd = GETRELDEP(pool, con); - if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_OTHERPROVIDERS) - continue; - } - p = 0; /* make it a negative assertion, aka 'uninstallable' */ + if (!pool->forbidselfconflicts || is_otherproviders_dep(pool, con)) + continue; + addpkgrule(solv, -n, 0, 0, SOLVER_RULE_PKG_SELF_CONFLICT, con); + continue; } - if (p && ispatch && solv->multiversion.size && MAPTST(&solv->multiversion, p) && ISRELDEP(con)) + if (ispatch && solv->multiversion.size && MAPTST(&solv->multiversion, p) && ISRELDEP(con)) { /* our patch conflicts with a multiversion package */ - p = -makemultiversionconflict(solv, p, con); + Id d = makemultiversionconflict(solv, p, con); + if (d) + { + addpkgrule(solv, -n, 0, d, SOLVER_RULE_PKG_CONFLICTS, con); + continue; + } } - /* rule: -n|-p: either solvable _or_ provider of conflict */ - addrpmrule(solv, -n, -p, p ? SOLVER_RULE_RPM_PACKAGE_CONFLICT : SOLVER_RULE_RPM_SELF_CONFLICT, con); + if (p == SYSTEMSOLVABLE) + p = 0; + /* rule: -n|-p: either solvable _or_ provider of conflict */ + addpkgrule(solv, -n, -p, 0, SOLVER_RULE_PKG_CONFLICTS, con); } } } @@ -679,7 +938,7 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m) /* foreach obsoletes */ while ((obs = *obsp++) != 0) { - /* foreach provider of an obsoletes of 's' */ + /* foreach provider of an obsoletes of 's' */ FOR_PROVIDES(p, pp, obs) { Solvable *ps = pool->solvables + p; @@ -692,10 +951,12 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m) continue; if (pool->obsoleteusescolors && !pool_colormatch(pool, s, ps)) continue; + if (p == SYSTEMSOLVABLE) + p = 0; if (!isinstalled) - addrpmrule(solv, -n, -p, SOLVER_RULE_RPM_PACKAGE_OBSOLETES, obs); + addpkgrule(solv, -n, -p, 0, SOLVER_RULE_PKG_OBSOLETES, obs); else - addrpmrule(solv, -n, -p, SOLVER_RULE_RPM_INSTALLEDPKG_OBSOLETES, obs); + addpkgrule(solv, -n, -p, 0, SOLVER_RULE_PKG_INSTALLED_OBSOLETES, obs); } } } @@ -716,27 +977,66 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m) /* we still obsolete packages with same nevra, like rpm does */ /* (actually, rpm mixes those packages. yuck...) */ if (multi && (s->name != ps->name || s->evr != ps->evr || s->arch != ps->arch)) - continue; + { + if (isinstalled || ps->repo != installed) + continue; + /* also check the installed package for multi-ness */ + if (MAPTST(&solv->multiversion, p)) + continue; + } if (!pool->implicitobsoleteusesprovides && s->name != ps->name) continue; if (pool->implicitobsoleteusescolors && !pool_colormatch(pool, s, ps)) continue; + if (p == SYSTEMSOLVABLE) + p = 0; if (s->name == ps->name) - addrpmrule(solv, -n, -p, SOLVER_RULE_RPM_SAME_NAME, 0); + { + /* optimization: do not add the same-name conflict rule if it was + * already added when we looked at the other package. + * (this assumes pool_colormatch is symmetric) */ + if (p && m && ps->repo != installed && MAPTST(m, p) && + (ps->arch != ARCH_SRC && ps->arch != ARCH_NOSRC) && + !(solv->multiversion.size && MAPTST(&solv->multiversion, p))) + continue; + addpkgrule(solv, -n, -p, 0, SOLVER_RULE_PKG_SAME_NAME, 0); + } else - addrpmrule(solv, -n, -p, SOLVER_RULE_RPM_IMPLICIT_OBSOLETES, s->name); + addpkgrule(solv, -n, -p, 0, SOLVER_RULE_PKG_IMPLICIT_OBSOLETES, s->name); } } } + if (m && pool->implicitobsoleteusescolors && (s->arch > pool->lastarch || pool->id2arch[s->arch] != 1)) + { + int a = pool->id2arch[s->arch]; + /* check lock-step candidates */ + FOR_PROVIDES(p, pp, s->name) + { + Solvable *ps = pool->solvables + p; + if (s->name != ps->name || s->evr != ps->evr || MAPTST(m, p)) + continue; + if (ps->arch > pool->lastarch || pool->id2arch[ps->arch] == 1 || pool->id2arch[ps->arch] >= a) + continue; + queue_push(&workq, p); + } + } + /*----------------------------------------- - * add recommends to the work queue + * add recommends/suggests to the work queue */ if (s->recommends && m) { recp = s->repo->idarraydata + s->recommends; while ((rec = *recp++) != 0) { +#ifdef ENABLE_COMPLEX_DEPS + if (pool_is_complex_dep(pool, rec)) + { + pool_add_pos_literals_complex_dep(pool, rec, &workq, m, 0); + continue; + } +#endif FOR_PROVIDES(p, pp, rec) if (!MAPTST(m, p)) queue_push(&workq, p); @@ -747,25 +1047,69 @@ solver_addrpmrulesforsolvable(Solver *solv, Solvable *s, Map *m) sugp = s->repo->idarraydata + s->suggests; while ((sug = *sugp++) != 0) { +#ifdef ENABLE_COMPLEX_DEPS + if (pool_is_complex_dep(pool, sug)) + { + pool_add_pos_literals_complex_dep(pool, sug, &workq, m, 0); + continue; + } +#endif FOR_PROVIDES(p, pp, sug) if (!MAPTST(m, p)) queue_push(&workq, p); } } } + queue_free(&prereqq); queue_free(&workq); } +#ifdef ENABLE_LINKED_PKGS +void +solver_addpkgrulesforlinked(Solver *solv, Map *m) +{ + Pool *pool = solv->pool; + Solvable *s; + int i, j; + Queue qr; + + queue_init(&qr); + for (i = 1; i < pool->nsolvables; i++) + { + if (MAPTST(m, i)) + continue; + s = pool->solvables + i; + if (!s->repo || s->repo == solv->installed) + continue; + if (!strchr(pool_id2str(pool, s->name), ':')) + continue; + if (!pool_installable(pool, s)) + continue; + find_package_link(pool, s, 0, &qr, 0, 0); + if (qr.count) + { + for (j = 0; j < qr.count; j++) + if (MAPTST(m, qr.elements[j])) + { + solver_addpkgrulesforsolvable(solv, s, m); + break; + } + queue_empty(&qr); + } + } + queue_free(&qr); +} +#endif /*------------------------------------------------------------------- - * + * * Add rules for packages possibly selected in by weak dependencies * * m: already added solvables */ void -solver_addrpmrulesforweak(Solver *solv, Map *m) +solver_addpkgrulesforweak(Solver *solv, Map *m) { Pool *pool = solv->pool; Solvable *s; @@ -807,23 +1151,23 @@ solver_addrpmrulesforweak(Solver *solv, Map *m) /* if nothing found, goto next solvables */ if (!sup) continue; - solver_addrpmrulesforsolvable(solv, s, m); + solver_addpkgrulesforsolvable(solv, s, m); n = 0; /* check all solvables again because we added solvables to m */ } } /*------------------------------------------------------------------- - * + * * add package rules for possible updates - * + * * s: solvable * m: map of already visited solvables * allow_all: 0 = dont allow downgrades, 1 = allow all candidates */ void -solver_addrpmrulesforupdaters(Solver *solv, Solvable *s, Map *m, int allow_all) +solver_addpkgrulesforupdaters(Solver *solv, Solvable *s, Map *m, int allow_all) { Pool *pool = solv->pool; int i; @@ -836,11 +1180,11 @@ solver_addrpmrulesforupdaters(Solver *solv, Solvable *s, Map *m, int allow_all) policy_findupdatepackages(solv, s, &qs, allow_all); /* add rule for 's' if not already done */ if (!MAPTST(m, s - pool->solvables)) - solver_addrpmrulesforsolvable(solv, s, m); + solver_addpkgrulesforsolvable(solv, s, m); /* foreach update candidate, add rule if not already done */ for (i = 0; i < qs.count; i++) if (!MAPTST(m, qs.elements[i])) - solver_addrpmrulesforsolvable(solv, pool->solvables + qs.elements[i], m); + solver_addpkgrulesforsolvable(solv, pool->solvables + qs.elements[i], m); queue_free(&qs); } @@ -853,37 +1197,61 @@ solver_addrpmrulesforupdaters(Solver *solv, Solvable *s, Map *m, int allow_all) *** ***/ -static Id -finddistupgradepackages(Solver *solv, Solvable *s, Queue *qs, int allow_all) +static int +dup_maykeepinstalled(Solver *solv, Solvable *s) { Pool *pool = solv->pool; - int i; + Id ip, pp; - policy_findupdatepackages(solv, s, qs, allow_all ? allow_all : 2); - if (!qs->count) + if (solv->dupmap.size && MAPTST(&solv->dupmap, s - pool->solvables)) + return 1; + /* is installed identical to a good one? */ + FOR_PROVIDES(ip, pp, s->name) { - if (allow_all) - return 0; /* orphaned, don't create feature rule */ - /* check if this is an orphaned package */ - policy_findupdatepackages(solv, s, qs, 1); - if (!qs->count) - return 0; /* orphaned, don't create update rule */ - qs->count = 0; - return -SYSTEMSOLVABLE; /* supported but not installable */ + Solvable *is = pool->solvables + ip; + if (is->evr != s->evr) + continue; + if (solv->dupmap.size) + { + if (!MAPTST(&solv->dupmap, ip)) + continue; + } + else if (is->repo == pool->installed) + continue; + if (solvable_identical(s, is)) + return 1; } - if (allow_all) - return s - pool->solvables; - /* check if it is ok to keep the installed package */ - for (i = 0; i < qs->count; i++) + return 0; +} + + +static Id +finddistupgradepackages(Solver *solv, Solvable *s, Queue *qs) +{ + Pool *pool = solv->pool; + int i, j; + + policy_findupdatepackages(solv, s, qs, 2); + if (qs->count) { - Solvable *ns = pool->solvables + qs->elements[i]; - if (s->evr == ns->evr && solvable_identical(s, ns)) - return s - pool->solvables; + /* remove installed packages we can't keep */ + for (i = j = 0; i < qs->count; i++) + { + Solvable *ns = pool->solvables + qs->elements[i]; + if (ns->repo == pool->installed && !dup_maykeepinstalled(solv, ns)) + continue; + qs->elements[j++] = qs->elements[i]; + } + queue_truncate(qs, j); } + /* check if it is ok to keep the installed package */ + if (dup_maykeepinstalled(solv, s)) + return s - pool->solvables; /* nope, it must be some other package */ return -SYSTEMSOLVABLE; } +#if 0 /* add packages from the dup repositories to the update candidates * this isn't needed for the global dup mode as all packages are * from dup repos in that case */ @@ -907,9 +1275,88 @@ addduppackages(Solver *solv, Solvable *s, Queue *qs) } queue_free(&dupqs); } +#endif + +/* stash away the original updaters for multiversion packages. We do this so that + * we can update the package later */ +static inline void +set_specialupdaters(Solver *solv, Solvable *s, Id d) +{ + Repo *installed = solv->installed; + if (!solv->specialupdaters) + solv->specialupdaters = solv_calloc(installed->end - installed->start, sizeof(Id)); + solv->specialupdaters[s - solv->pool->solvables - installed->start] = d; +} + +#ifdef ENABLE_LINKED_PKGS +/* Check if this is a linked pseudo package. As it is linked, we do not need an update/feature rule */ +static inline int +is_linked_pseudo_package(Solver *solv, Solvable *s) +{ + Pool *pool = solv->pool; + if (solv->instbuddy && solv->instbuddy[s - pool->solvables - solv->installed->start]) + { + const char *name = pool_id2str(pool, s->name); + if (strncmp(name, "pattern:", 8) == 0 || strncmp(name, "application:", 12) == 0) + return 1; + } + return 0; +} +#endif + +void +solver_addfeaturerule(Solver *solv, Solvable *s) +{ + Pool *pool = solv->pool; + int i; + Id p; + Queue qs; + Id qsbuf[64]; + +#ifdef ENABLE_LINKED_PKGS + if (is_linked_pseudo_package(solv, s)) + { + solver_addrule(solv, 0, 0, 0); /* no feature rules for those */ + return; + } +#endif + queue_init_buffer(&qs, qsbuf, sizeof(qsbuf)/sizeof(*qsbuf)); + p = s - pool->solvables; + policy_findupdatepackages(solv, s, &qs, 1); + if (solv->dupmap_all || (solv->dupinvolvedmap.size && MAPTST(&solv->dupinvolvedmap, p))) + { + if (!dup_maykeepinstalled(solv, s)) + { + for (i = 0; i < qs.count; i++) + { + Solvable *ns = pool->solvables + qs.elements[i]; + if (ns->repo != pool->installed || dup_maykeepinstalled(solv, ns)) + break; + } + if (i == qs.count) + { + solver_addrule(solv, 0, 0, 0); /* this is an orphan */ + queue_free(&qs); + return; + } + } + } + if (qs.count > 1) + { + Id d = pool_queuetowhatprovides(pool, &qs); + queue_free(&qs); + solver_addrule(solv, p, 0, d); /* allow update of s */ + } + else + { + Id d = qs.count ? qs.elements[0] : 0; + queue_free(&qs); + solver_addrule(solv, p, d, 0); /* allow update of s */ + } +} /*------------------------------------------------------------------- - * + * * add rule for update * (A|A1|A2|A3...) An = update candidates for A * @@ -917,80 +1364,126 @@ addduppackages(Solver *solv, Solvable *s, Queue *qs) */ void -solver_addupdaterule(Solver *solv, Solvable *s, int allow_all) +solver_addupdaterule(Solver *solv, Solvable *s) { /* installed packages get a special upgrade allowed rule */ Pool *pool = solv->pool; Id p, d; Queue qs; Id qsbuf[64]; + int isorphaned = 0; + Rule *r; - queue_init_buffer(&qs, qsbuf, sizeof(qsbuf)/sizeof(*qsbuf)); p = s - pool->solvables; + /* Orphan detection. We cheat by looking at the feature rule, which + * we already calculated */ + r = solv->rules + solv->featurerules + (p - solv->installed->start); + if (!r->p) + { +#ifdef ENABLE_LINKED_PKGS + if (is_linked_pseudo_package(solv, s)) + { + solver_addrule(solv, 0, 0, 0); + return; + } +#endif + p = 0; + queue_push(&solv->orphaned, s - pool->solvables); /* an orphaned package */ + if (solv->keep_orphans && !(solv->droporphanedmap_all || (solv->droporphanedmap.size && MAPTST(&solv->droporphanedmap, s - pool->solvables - solv->installed->start)))) + p = s - pool->solvables; /* keep this orphaned package installed */ + solver_addrule(solv, p, 0, 0); + return; + } + + queue_init_buffer(&qs, qsbuf, sizeof(qsbuf)/sizeof(*qsbuf)); /* find update candidates for 's' */ - if (solv->dupmap_all) - p = finddistupgradepackages(solv, s, &qs, allow_all); + if (solv->dupmap_all || (solv->dupinvolvedmap.size && MAPTST(&solv->dupinvolvedmap, p))) + p = finddistupgradepackages(solv, s, &qs); else - policy_findupdatepackages(solv, s, &qs, allow_all); - if (!allow_all && !solv->dupmap_all && solv->dupinvolvedmap.size && MAPTST(&solv->dupinvolvedmap, p)) - addduppackages(solv, s, &qs); + policy_findupdatepackages(solv, s, &qs, 0); - if (!allow_all && qs.count && solv->multiversion.size) + if (qs.count && solv->multiversion.size) { int i, j; - d = pool_queuetowhatprovides(pool, &qs); - /* filter out all multiversion packages as they don't update */ - for (i = j = 0; i < qs.count; i++) + for (i = 0; i < qs.count; i++) + if (MAPTST(&solv->multiversion, qs.elements[i])) + break; + if (i < qs.count) { - if (MAPTST(&solv->multiversion, qs.elements[i])) - { - Solvable *ps = pool->solvables + qs.elements[i]; - /* if keepexplicitobsoletes is set and the name is different, - * we assume that there is an obsoletes. XXX: not 100% correct */ - if (solv->keepexplicitobsoletes && ps->name != s->name) + /* filter out all multiversion packages as they don't update */ + d = pool_queuetowhatprovides(pool, &qs); /* save qs away */ + for (j = i; i < qs.count; i++) + { + if (MAPTST(&solv->multiversion, qs.elements[i])) { - qs.elements[j++] = qs.elements[i]; - continue; + Solvable *ps = pool->solvables + qs.elements[i]; + /* if keepexplicitobsoletes is set and the name is different, + * we assume that there is an obsoletes. XXX: not 100% correct */ + if (solv->keepexplicitobsoletes && ps->name != s->name) + { + qs.elements[j++] = qs.elements[i]; + continue; + } + /* it's ok if they have same nevra */ + if (ps->name != s->name || ps->evr != s->evr || ps->arch != s->arch) + continue; } - /* it's ok if they have same nevra */ - if (ps->name != s->name || ps->evr != s->evr || ps->arch != s->arch) - continue; + qs.elements[j++] = qs.elements[i]; } - qs.elements[j++] = qs.elements[i]; - } - if (j < qs.count) - { - if (d && solv->installed && s->repo == solv->installed && - (solv->updatemap_all || (solv->updatemap.size && MAPTST(&solv->updatemap, s - pool->solvables - solv->installed->start)))) + if (j < qs.count) /* filtered at least one package? */ { - if (!solv->multiversionupdaters) - solv->multiversionupdaters = solv_calloc(solv->installed->end - solv->installed->start, sizeof(Id)); - solv->multiversionupdaters[s - pool->solvables - solv->installed->start] = d; + if (j == 0 && p == -SYSTEMSOLVABLE) + { + /* this is a multiversion orphan */ + queue_push(&solv->orphaned, s - pool->solvables); + set_specialupdaters(solv, s, d); + if (solv->keep_orphans && !(solv->droporphanedmap_all || (solv->droporphanedmap.size && MAPTST(&solv->droporphanedmap, s - pool->solvables - solv->installed->start)))) + { + /* we need to keep the orphan */ + queue_free(&qs); + solver_addrule(solv, s - pool->solvables, 0, 0); + return; + } + /* we can drop it as long as we update */ + isorphaned = 1; + j = qs.count; /* force the update */ + } + else if (d && (solv->updatemap_all || (solv->updatemap.size && MAPTST(&solv->updatemap, s - pool->solvables - solv->installed->start)))) + { + /* non-orphan multiversion package, set special updaters if we want an update */ + set_specialupdaters(solv, s, d); + } + qs.count = j; } - if (j == 0 && p == -SYSTEMSOLVABLE && solv->dupmap_all) + else if (p != -SYSTEMSOLVABLE) { - queue_push(&solv->orphaned, s - pool->solvables); /* treat as orphaned */ - j = qs.count; + /* could fallthrough, but then we would do pool_queuetowhatprovides twice */ + queue_free(&qs); + solver_addrule(solv, s - pool->solvables, 0, d); /* allow update of s */ + return; } - qs.count = j; - } - else if (p != -SYSTEMSOLVABLE) - { - /* could fallthrough, but then we would do pool_queuetowhatprovides twice */ - queue_free(&qs); - solver_addrule(solv, p, d); /* allow update of s */ - return; } } + if (!isorphaned && p == -SYSTEMSOLVABLE && qs.count && solv->dupmap.size) + p = s - pool->solvables; /* let the dup rules sort it out */ if (qs.count && p == -SYSTEMSOLVABLE) p = queue_shift(&qs); - d = qs.count ? pool_queuetowhatprovides(pool, &qs) : 0; - queue_free(&qs); - solver_addrule(solv, p, d); /* allow update of s */ + if (qs.count > 1) + { + d = pool_queuetowhatprovides(pool, &qs); + queue_free(&qs); + solver_addrule(solv, p, 0, d); /* allow update of s */ + } + else + { + d = qs.count ? qs.elements[0] : 0; + queue_free(&qs); + solver_addrule(solv, p, d, 0); /* allow update of s */ + } } -static inline void +static inline void disableupdaterule(Solver *solv, Id p) { Rule *r; @@ -1012,7 +1505,7 @@ disableupdaterule(Solver *solv, Id p) } } -static inline void +static inline void reenableupdaterule(Solver *solv, Id p) { Pool *pool = solv->pool; @@ -1021,7 +1514,7 @@ reenableupdaterule(Solver *solv, Id p) MAPCLR(&solv->noupdate, p - solv->installed->start); r = solv->rules + solv->updaterules + (p - solv->installed->start); if (r->p) - { + { if (r->d < 0) { solver_enablerule(solv, r); @@ -1069,13 +1562,16 @@ void solver_addinfarchrules(Solver *solv, Map *addedmap) { Pool *pool = solv->pool; + Repo *installed = pool->installed; int first, i, j; Id p, pp, a, aa, bestarch; Solvable *s, *ps, *bests; Queue badq, allowedarchs; + Queue lsq; queue_init(&badq); queue_init(&allowedarchs); + queue_init(&lsq); solv->infarchrules = solv->nrules; for (i = 1; i < pool->nsolvables; i++) { @@ -1097,7 +1593,7 @@ solver_addinfarchrules(Solver *solv, Map *addedmap) break; a = ps->arch; a = (a <= pool->lastarch) ? pool->id2arch[a] : 0; - if (a != 1 && pool->installed && ps->repo == pool->installed) + if (a != 1 && installed && ps->repo == installed) { if (!solv->dupmap_all && !(solv->dupinvolvedmap.size && MAPTST(&solv->dupinvolvedmap, p))) queue_pushunique(&allowedarchs, ps->arch); /* also ok to keep this architecture */ @@ -1111,9 +1607,51 @@ solver_addinfarchrules(Solver *solv, Map *addedmap) } if (first) continue; + /* speed up common case where installed package already has best arch */ if (allowedarchs.count == 1 && bests && allowedarchs.elements[0] == bests->arch) allowedarchs.count--; /* installed arch is best */ + + if (allowedarchs.count && pool->implicitobsoleteusescolors && installed && bestarch) + { + /* need an extra pass for lockstep checking: we only allow to keep an inferior arch + * if the corresponding installed package is not lock-stepped */ + queue_empty(&allowedarchs); + FOR_PROVIDES(p, pp, s->name) + { + Id p2, pp2; + ps = pool->solvables + p; + if (ps->name != s->name || ps->repo != installed || !MAPTST(addedmap, p)) + continue; + if (solv->dupmap_all || (solv->dupinvolvedmap.size && MAPTST(&solv->dupinvolvedmap, p))) + continue; + a = ps->arch; + a = (a <= pool->lastarch) ? pool->id2arch[a] : 0; + if (!a) + { + queue_pushunique(&allowedarchs, ps->arch); /* strange arch, allow */ + continue; + } + if (a == 1 || ((a ^ bestarch) & 0xffff0000) == 0) + continue; + /* have installed package with inferior arch, check if lock-stepped */ + FOR_PROVIDES(p2, pp2, s->name) + { + Solvable *s2 = pool->solvables + p2; + Id a2; + if (p2 == p || s2->name != s->name || s2->evr != pool->solvables[p].evr || s2->arch == pool->solvables[p].arch) + continue; + a2 = s2->arch; + a2 = (a2 <= pool->lastarch) ? pool->id2arch[a2] : 0; + if (a2 && (a2 == 1 || ((a2 ^ bestarch) & 0xffff0000) == 0)) + break; + } + if (!p2) + queue_pushunique(&allowedarchs, ps->arch); + } + } + + /* find all bad packages */ queue_empty(&badq); FOR_PROVIDES(p, pp, s->name) { @@ -1124,8 +1662,12 @@ solver_addinfarchrules(Solver *solv, Map *addedmap) a = (a <= pool->lastarch) ? pool->id2arch[a] : 0; if (a != 1 && bestarch && ((a ^ bestarch) & 0xffff0000) != 0) { - if (pool->installed && ps->repo == pool->installed) - continue; /* always ok to keep an installed package */ + if (installed && ps->repo == installed) + { + if (pool->implicitobsoleteusescolors) + queue_push(&badq, p); /* special lock-step handling, see below */ + continue; /* always ok to keep an installed package */ + } for (j = 0; j < allowedarchs.count; j++) { aa = allowedarchs.elements[j]; @@ -1139,15 +1681,41 @@ solver_addinfarchrules(Solver *solv, Map *addedmap) queue_push(&badq, p); } } - if (!badq.count) - continue; + /* block all solvables in the badq! */ for (j = 0; j < badq.count; j++) { p = badq.elements[j]; - solver_addrule(solv, -p, 0); + /* lock-step */ + if (pool->implicitobsoleteusescolors) + { + Id p2; + int haveinstalled = 0; + queue_empty(&lsq); + FOR_PROVIDES(p2, pp, s->name) + { + Solvable *s2 = pool->solvables + p2; + if (p2 == p || s2->name != s->name || s2->evr != pool->solvables[p].evr || s2->arch == pool->solvables[p].arch) + continue; + a = s2->arch; + a = (a <= pool->lastarch) ? pool->id2arch[a] : 0; + if (a && (a == 1 || ((a ^ bestarch) & 0xffff000) == 0)) + { + queue_push(&lsq, p2); + if (installed && s2->repo == installed) + haveinstalled = 1; + } + } + if (installed && pool->solvables[p].repo == installed && !haveinstalled) + continue; /* installed package not in lock-step */ + } + if (lsq.count < 2) + solver_addrule(solv, -p, lsq.count ? lsq.elements[0] : 0, 0); + else + solver_addrule(solv, -p, 0, pool_queuetowhatprovides(pool, &lsq)); } } + queue_free(&lsq); queue_free(&badq); queue_free(&allowedarchs); solv->infarchrules_end = solv->nrules; @@ -1196,18 +1764,18 @@ reenableinfarchrule(Solver *solv, Id name) *** ***/ -static inline void +static inline void add_cleandeps_package(Solver *solv, Id p) { if (!solv->cleandeps_updatepkgs) - { + { solv->cleandeps_updatepkgs = solv_calloc(1, sizeof(Queue)); queue_init(solv->cleandeps_updatepkgs); - } - queue_pushunique(solv->cleandeps_updatepkgs, p); + } + queue_pushunique(solv->cleandeps_updatepkgs, p); } -static inline void +static void solver_addtodupmaps(Solver *solv, Id p, Id how, int targeted) { Pool *pool = solv->pool; @@ -1327,6 +1895,15 @@ solver_createdupmaps(Solver *solv) solver_addtodupmaps(solv, p, how, targeted); } } + else if (select == SOLVER_SOLVABLE_ALL) + { + FOR_POOL_SOLVABLES(p) + { + MAPSET(&solv->dupinvolvedmap, p); + if (installed && pool->solvables[p].repo != installed) + MAPSET(&solv->dupmap, p); + } + } else { targeted = how & SOLVER_TARGETED ? 1 : 0; @@ -1371,9 +1948,11 @@ void solver_addduprules(Solver *solv, Map *addedmap) { Pool *pool = solv->pool; + Repo *installed = solv->installed; Id p, pp; Solvable *s, *ps; int first, i; + Rule *r; solv->duprules = solv->nrules; for (i = 1; i < pool->nsolvables; i++) @@ -1393,11 +1972,11 @@ solver_addduprules(Solver *solv, Map *addedmap) break; if (!MAPTST(&solv->dupinvolvedmap, p)) continue; - if (solv->installed && ps->repo == solv->installed) + if (installed && ps->repo == installed) { if (!solv->updatemap.size) - map_grow(&solv->updatemap, solv->installed->end - solv->installed->start); - MAPSET(&solv->updatemap, p - solv->installed->start); + map_grow(&solv->updatemap, installed->end - installed->start); + MAPSET(&solv->updatemap, p - installed->start); if (!MAPTST(&solv->dupmap, p)) { Id ip, ipp; @@ -1410,14 +1989,32 @@ solver_addduprules(Solver *solv, Map *addedmap) if (is->evr == ps->evr && solvable_identical(ps, is)) break; } - if (!ip) - solver_addrule(solv, -p, 0); /* no match, sorry */ - else - MAPSET(&solv->dupmap, p); /* for best rules processing */ + if (ip) + { + /* ok, found a good one. we may keep this package. */ + MAPSET(&solv->dupmap, p); /* for best rules processing */ + continue; + } + r = solv->rules + solv->updaterules + (p - installed->start); + if (!r->p) + r = solv->rules + solv->featurerules + (p - installed->start); + if (r->p && solv->specialupdaters && solv->specialupdaters[p - installed->start]) + { + /* this is a multiversion orphan, we're good if an update is installed */ + solver_addrule(solv, -p, 0, solv->specialupdaters[p - installed->start]); + continue; + } + if (!r->p || (r->p == p && !r->d && !r->w2)) + { + /* this is an orphan */ + MAPSET(&solv->dupmap, p); /* for best rules processing */ + continue; + } + solver_addrule(solv, -p, 0, 0); /* no match, sorry */ } } else if (!MAPTST(&solv->dupmap, p)) - solver_addrule(solv, -p, 0); + solver_addrule(solv, -p, 0, 0); } } solv->duprules_end = solv->nrules; @@ -1430,21 +2027,21 @@ disableduprule(Solver *solv, Id name) Pool *pool = solv->pool; Rule *r; int i; - for (i = solv->duprules, r = solv->rules + i; i < solv->duprules_end; i++, r++) - { + for (i = solv->duprules, r = solv->rules + i; i < solv->duprules_end; i++, r++) + { if (r->p < 0 && r->d >= 0 && pool->solvables[-r->p].name == name) solver_disablerule(solv, r); - } + } } -static inline void +static inline void reenableduprule(Solver *solv, Id name) { Pool *pool = solv->pool; Rule *r; int i; - for (i = solv->duprules, r = solv->rules + i; i < solv->duprules_end; i++, r++) - { + for (i = solv->duprules, r = solv->rules + i; i < solv->duprules_end; i++, r++) + { if (r->p < 0 && r->d < 0 && pool->solvables[-r->p].name == name) { solver_enablerule(solv, r); @@ -1471,7 +2068,7 @@ reenableduprule(Solver *solv, Id name) #define DISABLE_INFARCH 2 #define DISABLE_DUP 3 -/* +/* * add all installed packages that package p obsoletes to Queue q. * Package p is not installed. Also, we know that if * solv->keepexplicitobsoletes is not set, p is not in the multiversion map. @@ -1496,7 +2093,7 @@ add_obsoletes(Solver *solv, Id p, Queue *q) continue; if (!pool->implicitobsoleteusesprovides && ps->name != s->name) continue; - if (pool->implicitobsoleteusescolors && !pool_colormatch(pool, s, ps)) + if (pool->implicitobsoleteusescolors && !pool_colormatch(pool, s, ps)) continue; queue_push(q, p2); lastp2 = p2; @@ -1506,14 +2103,14 @@ add_obsoletes(Solver *solv, Id p, Queue *q) return; obsp = s->repo->idarraydata + s->obsoletes; while ((obs = *obsp++) != 0) - FOR_PROVIDES(p2, pp2, obs) + FOR_PROVIDES(p2, pp2, obs) { Solvable *ps = pool->solvables + p2; if (ps->repo != installed) continue; if (!pool->obsoleteusesprovides && !pool_match_nevr(pool, ps, obs)) continue; - if (pool->obsoleteusescolors && !pool_colormatch(pool, s, ps)) + if (pool->obsoleteusescolors && !pool_colormatch(pool, s, ps)) continue; if (p2 == lastp2) continue; @@ -1768,7 +2365,13 @@ jobtodisablelist(Solver *solv, Id how, Id what, Queue *q) queue_push2(q, DISABLE_UPDATE, p); FOR_JOB_SELECT(p, pp, select, what) if (pool->solvables[p].repo == installed) - queue_push2(q, DISABLE_UPDATE, p); + { + queue_push2(q, DISABLE_UPDATE, p); +#ifdef ENABLE_LINKED_PKGS + if (solv->instbuddy && solv->instbuddy[p - installed->start] > 1) + queue_push2(q, DISABLE_UPDATE, solv->instbuddy[p - installed->start]); +#endif + } return; default: return; @@ -1969,35 +2572,30 @@ solver_reenablepolicyrules_cleandeps(Solver *solv, Id pkg) ***/ static void -addrpmruleinfo(Solver *solv, Id p, Id d, int type, Id dep) +addpkgruleinfo(Solver *solv, Id p, Id p2, Id d, int type, Id dep) { Pool *pool = solv->pool; Rule *r; - Id w2, op, od, ow2; - - /* check if this creates the rule we're searching for */ - r = solv->rules + solv->ruleinfoq->elements[0]; - op = r->p; - od = r->d < 0 ? -r->d - 1 : r->d; - ow2 = 0; - - /* normalize */ - w2 = d > 0 ? 0 : d; - if (p < 0 && d > 0 && (!pool->whatprovidesdata[d] || !pool->whatprovidesdata[d + 1])) - { - w2 = pool->whatprovidesdata[d]; - d = 0; - } - if (p > 0 && d < 0) /* this hack is used for buddy deps */ + if (d) { - w2 = p; - p = d; + assert(!p2 && d > 0); + if (!pool->whatprovidesdata[d]) + d = 0; + else if (!pool->whatprovidesdata[d + 1]) + { + p2 = pool->whatprovidesdata[d]; + d = 0; + } } - if (d > 0) + /* check if this creates the rule we're searching for */ + r = solv->rules + solv->ruleinfoq->elements[0]; + if (d) { - if (p != op && !od) + /* three or more literals */ + Id od = r->d < 0 ? -r->d - 1 : r->d; + if (p != r->p && !od) return; if (d != od) { @@ -2009,43 +2607,33 @@ addrpmruleinfo(Solver *solv, Id p, Id d, int type, Id dep) if (*odp) return; } - w2 = 0; - /* handle multiversion conflict rules */ - if (p < 0 && pool->whatprovidesdata[d] < 0) - { - w2 = pool->whatprovidesdata[d]; - /* XXX: free memory */ - } + if (p < 0 && pool->whatprovidesdata[d] < 0 && type == SOLVER_RULE_PKG_CONFLICTS) + p2 = pool->whatprovidesdata[d]; } else { - if (od) - return; - ow2 = r->w2; - if (p > w2) + /* one or two literals */ + Id op = p, op2 = p2; + if (op2 && op > op2) /* normalize */ { - if (w2 != op || p != ow2) - return; + Id o = op; + op = op2; + op2 = o; } - else + if (r->p != op || r->w2 != op2 || (r->d && r->d != -1)) + return; + if (type == SOLVER_RULE_PKG_CONFLICTS && !p2) + p2 = -SYSTEMSOLVABLE; + if (type == SOLVER_RULE_PKG_SAME_NAME) { - if (p != op || w2 != ow2) - return; + p = op; /* we normalize same name order */ + p2 = op2; } } /* yep, rule matches. record info */ queue_push(solv->ruleinfoq, type); - if (type == SOLVER_RULE_RPM_SAME_NAME) - { - /* we normalize same name order */ - queue_push(solv->ruleinfoq, op < 0 ? -op : 0); - queue_push(solv->ruleinfoq, ow2 < 0 ? -ow2 : 0); - } - else - { - queue_push(solv->ruleinfoq, p < 0 ? -p : 0); - queue_push(solv->ruleinfoq, w2 < 0 ? -w2 : 0); - } + queue_push(solv->ruleinfoq, p < 0 ? -p : 0); + queue_push(solv->ruleinfoq, p2 < 0 ? -p2 : 0); queue_push(solv->ruleinfoq, dep); } @@ -2070,15 +2658,47 @@ solver_allruleinfos_cmp(const void *ap, const void *bp, void *dp) return 0; } +static void +getpkgruleinfos(Solver *solv, Rule *r, Queue *rq) +{ + Pool *pool = solv->pool; + Id l, pp; + if (r->p >= 0) + return; + queue_push(rq, r - solv->rules); /* push the rule we're interested in */ + solv->ruleinfoq = rq; + FOR_RULELITERALS(l, pp, r) + { + if (l >= 0) + break; + solver_addpkgrulesforsolvable(solv, pool->solvables - l, 0); + } +#ifdef ENABLE_LINKED_PKGS + FOR_RULELITERALS(l, pp, r) + { + if (l < 0) + { + if (l == r->p) + continue; + break; + } + if (!strchr(pool_id2str(pool, pool->solvables[l].name), ':') || !has_package_link(pool, pool->solvables + l)) + break; + add_package_link(solv, pool->solvables + l, 0, 0); + } +#endif + solv->ruleinfoq = 0; + queue_shift(rq); +} + int solver_allruleinfos(Solver *solv, Id rid, Queue *rq) { - Pool *pool = solv->pool; Rule *r = solv->rules + rid; int i, j; queue_empty(rq); - if (rid <= 0 || rid >= solv->rpmrules_end) + if (rid <= 0 || rid >= solv->pkgrules_end) { Id type, from, to, dep; type = solver_ruleinfo(solv, rid, &from, &to, &dep); @@ -2088,16 +2708,7 @@ solver_allruleinfos(Solver *solv, Id rid, Queue *rq) queue_push(rq, dep); return 1; } - if (r->p >= 0) - return 0; - queue_push(rq, rid); - solv->ruleinfoq = rq; - solver_addrpmrulesforsolvable(solv, pool->solvables - r->p, 0); - /* also try reverse direction for conflicts */ - if ((r->d == 0 || r->d == -1) && r->w2 < 0) - solver_addrpmrulesforsolvable(solv, pool->solvables - r->w2, 0); - solv->ruleinfoq = 0; - queue_shift(rq); + getpkgruleinfos(solv, r, rq); /* now sort & unify em */ if (!rq->count) return 0; @@ -2107,7 +2718,7 @@ solver_allruleinfos(Solver *solv, Id rid, Queue *rq) { if (j) { - if (rq->elements[i] == rq->elements[j - 4] && + if (rq->elements[i] == rq->elements[j - 4] && rq->elements[i + 1] == rq->elements[j - 3] && rq->elements[i + 2] == rq->elements[j - 2] && rq->elements[i + 3] == rq->elements[j - 1]) @@ -2135,32 +2746,26 @@ solver_ruleinfo(Solver *solv, Id rid, Id *fromp, Id *top, Id *depp) *top = 0; if (depp) *depp = 0; - if (rid > 0 && rid < solv->rpmrules_end) + if (rid > 0 && rid < solv->pkgrules_end) { Queue rq; int i; if (r->p >= 0) - return SOLVER_RULE_RPM; + return SOLVER_RULE_PKG; if (fromp) *fromp = -r->p; queue_init(&rq); - queue_push(&rq, rid); - solv->ruleinfoq = &rq; - solver_addrpmrulesforsolvable(solv, pool->solvables - r->p, 0); - /* also try reverse direction for conflicts */ - if ((r->d == 0 || r->d == -1) && r->w2 < 0) - solver_addrpmrulesforsolvable(solv, pool->solvables - r->w2, 0); - solv->ruleinfoq = 0; - type = SOLVER_RULE_RPM; - for (i = 1; i < rq.count; i += 4) + getpkgruleinfos(solv, r, &rq); + type = SOLVER_RULE_PKG; + for (i = 0; i < rq.count; i += 4) { Id qt, qo, qp, qd; qt = rq.elements[i]; qp = rq.elements[i + 1]; qo = rq.elements[i + 2]; qd = rq.elements[i + 3]; - if (type == SOLVER_RULE_RPM || type > qt) + if (type == SOLVER_RULE_PKG || type > qt) { type = qt; if (fromp) @@ -2228,8 +2833,26 @@ solver_ruleinfo(Solver *solv, Id rid, Id *fromp, Id *top, Id *depp) } if (rid >= solv->bestrules && rid < solv->bestrules_end) { + if (fromp && solv->bestrules_pkg[rid - solv->bestrules] > 0) + *fromp = solv->bestrules_pkg[rid - solv->bestrules]; return SOLVER_RULE_BEST; } + if (rid >= solv->yumobsrules && rid < solv->yumobsrules_end) + { + if (fromp) + *fromp = -r->p; + if (top) + { + /* first solvable is enough, we just need it for the name */ + if (!r->d || r->d == -1) + *top = r->w2; + else + *top = pool->whatprovidesdata[r->d < 0 ? -r->d : r->d]; + } + if (depp) + *depp = solv->yumobsrules_info[rid - solv->yumobsrules]; + return SOLVER_RULE_YUMOBS; + } if (rid >= solv->choicerules && rid < solv->choicerules_end) { return SOLVER_RULE_CHOICE; @@ -2246,8 +2869,8 @@ solver_ruleclass(Solver *solv, Id rid) { if (rid <= 0) return SOLVER_RULE_UNKNOWN; - if (rid > 0 && rid < solv->rpmrules_end) - return SOLVER_RULE_RPM; + if (rid > 0 && rid < solv->pkgrules_end) + return SOLVER_RULE_PKG; if (rid >= solv->jobrules && rid < solv->jobrules_end) return SOLVER_RULE_JOB; if (rid >= solv->updaterules && rid < solv->updaterules_end) @@ -2260,9 +2883,11 @@ solver_ruleclass(Solver *solv, Id rid) return SOLVER_RULE_INFARCH; if (rid >= solv->bestrules && rid < solv->bestrules_end) return SOLVER_RULE_BEST; + if (rid >= solv->yumobsrules && rid < solv->yumobsrules_end) + return SOLVER_RULE_YUMOBS; if (rid >= solv->choicerules && rid < solv->choicerules_end) return SOLVER_RULE_CHOICE; - if (rid >= solv->learntrules) + if (rid >= solv->learntrules && rid < solv->nrules) return SOLVER_RULE_LEARNT; return SOLVER_RULE_UNKNOWN; } @@ -2291,6 +2916,7 @@ solver_rule2jobidx(Solver *solv, Id rid) return solv->ruletojob.elements[rid - solv->jobrules] + 1; } +/* job rule introspection */ Id solver_rule2job(Solver *solv, Id rid, Id *whatp) { @@ -2307,6 +2933,7 @@ solver_rule2job(Solver *solv, Id rid, Id *whatp) return solv->job.elements[idx]; } +/* update/feature rule introspection */ Id solver_rule2solvable(Solver *solv, Id rid) { @@ -2317,34 +2944,102 @@ solver_rule2solvable(Solver *solv, Id rid) return 0; } +Id +solver_rule2pkgrule(Solver *solv, Id rid) +{ + if (rid >= solv->choicerules && rid < solv->choicerules_end) + return solv->choicerules_ref[rid - solv->choicerules]; + return 0; +} + +static void +solver_rule2rules_rec(Solver *solv, Id rid, Queue *q, Map *seen) +{ + int i; + Id rid2; + + if (seen) + MAPSET(seen, rid); + for (i = solv->learnt_why.elements[rid - solv->learntrules]; (rid2 = solv->learnt_pool.elements[i]) != 0; i++) + { + if (seen) + { + if (MAPTST(seen, rid2)) + continue; + if (rid2 >= solv->learntrules) + solver_rule2rules_rec(solv, rid2, q, seen); + continue; + } + queue_push(q, rid2); + } +} + +/* learnt rule introspection */ +void +solver_rule2rules(Solver *solv, Id rid, Queue *q, int recursive) +{ + queue_empty(q); + if (rid < solv->learntrules || rid >= solv->nrules) + return; + if (recursive) + { + Map seen; + map_init(&seen, solv->nrules); + solver_rule2rules_rec(solv, rid, q, &seen); + map_free(&seen); + } + else + solver_rule2rules_rec(solv, rid, q, 0); +} + + /* check if the newest versions of pi still provides the dependency we're looking for */ static int -solver_choicerulecheck(Solver *solv, Id pi, Rule *r, Map *m) +solver_choicerulecheck(Solver *solv, Id pi, Rule *r, Map *m, Queue *q) { Pool *pool = solv->pool; Rule *ur; - Queue q; - Id p, pp, qbuf[32]; + Id p, pp; int i; - ur = solv->rules + solv->updaterules + (pi - pool->installed->start); - if (!ur->p) - ur = solv->rules + solv->featurerules + (pi - pool->installed->start); - if (!ur->p) - return 0; - queue_init_buffer(&q, qbuf, sizeof(qbuf)/sizeof(*qbuf)); - FOR_RULELITERALS(p, pp, ur) - if (p > 0) - queue_push(&q, p); - if (q.count > 1) - policy_filter_unwanted(solv, &q, POLICY_MODE_CHOOSE); - for (i = 0; i < q.count; i++) - if (MAPTST(m, q.elements[i])) - break; - /* 1: none of the newest versions provide it */ - i = i == q.count ? 1 : 0; - queue_free(&q); - return i; + if (!q->count || q->elements[0] != pi) + { + if (q->count) + queue_empty(q); + ur = solv->rules + solv->updaterules + (pi - pool->installed->start); + if (!ur->p) + ur = solv->rules + solv->featurerules + (pi - pool->installed->start); + if (!ur->p) + return 0; + queue_push2(q, pi, 0); + FOR_RULELITERALS(p, pp, ur) + if (p > 0) + queue_push(q, p); + } + if (q->count == 2) + return 1; + if (q->count == 3) + { + p = q->elements[2]; + return MAPTST(m, p) ? 0 : 1; + } + if (!q->elements[1]) + { + for (i = 2; i < q->count; i++) + if (!MAPTST(m, q->elements[i])) + break; + if (i == q->count) + return 0; /* all provide it, no need to filter */ + /* some don't provide it, have to filter */ + queue_deleten(q, 0, 2); + policy_filter_unwanted(solv, q, POLICY_MODE_CHOOSE); + queue_unshift(q, 1); /* filter mark */ + queue_unshift(q, pi); + } + for (i = 2; i < q->count; i++) + if (MAPTST(m, q->elements[i])) + return 0; /* at least one provides it */ + return 1; /* none of the new packages provided it */ } static inline void @@ -2369,7 +3064,7 @@ solver_addchoicerules(Solver *solv) Pool *pool = solv->pool; Map m, mneg; Rule *r; - Queue q, qi; + Queue q, qi, qcheck; int i, j, rid, havechoice; Id p, d, pp; Id p2, pp2; @@ -2385,9 +3080,10 @@ solver_addchoicerules(Solver *solv) return; } now = solv_timems(0); - solv->choicerules_ref = solv_calloc(solv->rpmrules_end, sizeof(Id)); + solv->choicerules_ref = solv_calloc(solv->pkgrules_end, sizeof(Id)); queue_init(&q); queue_init(&qi); + queue_init(&qcheck); map_init(&m, pool->nsolvables); map_init(&mneg, pool->nsolvables); /* set up negative assertion map from infarch and dup rules */ @@ -2400,10 +3096,10 @@ solver_addchoicerules(Solver *solv) lastaddedp = 0; lastaddedd = 0; lastaddedcnt = 0; - for (rid = 1; rid < solv->rpmrules_end ; rid++) + for (rid = 1; rid < solv->pkgrules_end ; rid++) { r = solv->rules + rid; - if (r->p >= 0 || ((r->d == 0 || r->d == -1) && r->w2 < 0)) + if (r->p >= 0 || ((r->d == 0 || r->d == -1) && r->w2 <= 0)) continue; /* only look at requires rules */ /* solver_printrule(solv, SOLV_DEBUG_RESULT, r); */ queue_empty(&q); @@ -2505,7 +3201,7 @@ solver_addchoicerules(Solver *solv) p2 = qi.elements[i]; if (!p2) continue; - if (solver_choicerulecheck(solv, p2, r, &m)) + if (solver_choicerulecheck(solv, p2, r, &m, &qcheck)) { /* oops, remove element p from q */ queue_removeelement(&q, qi.elements[i + 1]); @@ -2514,6 +3210,7 @@ solver_addchoicerules(Solver *solv) qi.elements[j++] = p2; } queue_truncate(&qi, j); + if (!q.count || !qi.count) { FOR_RULELITERALS(p, pp, r) @@ -2573,7 +3270,7 @@ solver_addchoicerules(Solver *solv) lastaddedd = d; lastaddedcnt = q.count; - solver_addrule(solv, r->p, d); + solver_addrule(solv, r->p, 0, d); queue_push(&solv->weakruleq, solv->nrules - 1); solv->choicerules_ref[solv->nrules - 1 - solv->choicerules] = rid; #if 0 @@ -2585,6 +3282,7 @@ solver_addchoicerules(Solver *solv) } queue_free(&q); queue_free(&qi); + queue_free(&qcheck); map_free(&m); map_free(&mneg); solv->choicerules_end = solv->nrules; @@ -2630,9 +3328,9 @@ static void prune_to_update_targets(Solver *solv, Id *cp, Queue *q) { int i, j; - Id p, *cp2; + Id p, *cp2; for (i = j = 0; i < q->count; i++) - { + { p = q->elements[i]; for (cp2 = cp; *cp2; cp2++) if (*cp2 == p) @@ -2705,83 +3403,311 @@ solver_addbestrules(Solver *solv, int havebestinstalljobs) if (q.count == oldcnt) continue; /* nothing filtered */ p2 = queue_shift(&q); - solver_addrule(solv, p2, q.count ? pool_queuetowhatprovides(pool, &q) : 0); + if (q.count < 2) + solver_addrule(solv, p2, q.count ? q.elements[0] : 0, 0); + else + solver_addrule(solv, p2, 0, pool_queuetowhatprovides(pool, &q)); queue_push(&r2pkg, -(solv->jobrules + j)); } } } - - if (solv->bestupdatemap_all || solv->bestupdatemap.size) + + if (solv->bestupdatemap_all || solv->bestupdatemap.size) + { + FOR_REPO_SOLVABLES(installed, p, s) + { + Id d, p2, pp2; + if (!solv->updatemap_all && (!solv->updatemap.size || !MAPTST(&solv->updatemap, p - installed->start))) + continue; + if (!solv->bestupdatemap_all && (!solv->bestupdatemap.size || !MAPTST(&solv->bestupdatemap, p - installed->start))) + continue; + queue_empty(&q); + if (solv->bestobeypolicy) + r = solv->rules + solv->updaterules + (p - installed->start); + else + { + r = solv->rules + solv->featurerules + (p - installed->start); + if (!r->p) /* identical to update rule? */ + r = solv->rules + solv->updaterules + (p - installed->start); + } + if (solv->specialupdaters && (d = solv->specialupdaters[p - installed->start]) != 0 && r == solv->rules + solv->updaterules + (p - installed->start)) + { + /* need to check specialupdaters */ + if (r->p == p) /* be careful with the dup case */ + queue_push(&q, p); + while ((p2 = pool->whatprovidesdata[d++]) != 0) + queue_push(&q, p2); + } + else + { + FOR_RULELITERALS(p2, pp2, r) + if (p2 > 0) + queue_push(&q, p2); + } + if (solv->update_targets && solv->update_targets->elements[p - installed->start]) + prune_to_update_targets(solv, solv->update_targets->elements + solv->update_targets->elements[p - installed->start], &q); + if (solv->dupinvolvedmap.size && MAPTST(&solv->dupinvolvedmap, p)) + prune_to_dup_packages(solv, p, &q); + /* select best packages, just look at prio and version */ + policy_filter_unwanted(solv, &q, POLICY_MODE_RECOMMEND); + if (!q.count) + continue; /* orphaned */ + if (solv->bestobeypolicy) + { + /* also filter the best of the feature rule packages and add them */ + r = solv->rules + solv->featurerules + (p - installed->start); + if (r->p) + { + int j; + queue_empty(&q2); + FOR_RULELITERALS(p2, pp2, r) + if (p2 > 0) + queue_push(&q2, p2); + if (solv->update_targets && solv->update_targets->elements[p - installed->start]) + prune_to_update_targets(solv, solv->update_targets->elements + solv->update_targets->elements[p - installed->start], &q2); + if (solv->dupinvolvedmap.size && MAPTST(&solv->dupinvolvedmap, p)) + prune_to_dup_packages(solv, p, &q2); + policy_filter_unwanted(solv, &q2, POLICY_MODE_RECOMMEND); + for (j = 0; j < q2.count; j++) + queue_pushunique(&q, q2.elements[j]); + } + } + p2 = queue_shift(&q); + if (q.count < 2) + solver_addrule(solv, p2, q.count ? q.elements[0] : 0, 0); + else + solver_addrule(solv, p2, 0, pool_queuetowhatprovides(pool, &q)); + queue_push(&r2pkg, p); + } + } + if (r2pkg.count) + solv->bestrules_pkg = solv_memdup2(r2pkg.elements, r2pkg.count, sizeof(Id)); + solv->bestrules_end = solv->nrules; + queue_free(&q); + queue_free(&q2); + queue_free(&r2pkg); +} + + + + +/* yumobs rule handling */ + +static void +find_obsolete_group(Solver *solv, Id obs, Queue *q) +{ + Pool *pool = solv->pool; + Queue qn; + Id p2, pp2, op, *opp, opp2; + int i, j, qnc, ncnt; + + queue_empty(q); + FOR_PROVIDES(p2, pp2, obs) + { + Solvable *s2 = pool->solvables + p2; + if (s2->repo != pool->installed) + continue; + if (!pool->obsoleteusesprovides && !pool_match_nevr(pool, pool->solvables + p2, obs)) + continue; + /* we obsolete installed package s2 with obs. now find all other packages that have the same dep */ + for (opp = solv->obsoletes_data + solv->obsoletes[p2 - solv->installed->start]; (op = *opp++) != 0;) + { + Solvable *os = pool->solvables + op; + Id obs2, *obsp2; + if (!os->obsoletes) + continue; + if (pool->obsoleteusescolors && !pool_colormatch(pool, s2, os)) + continue; + obsp2 = os->repo->idarraydata + os->obsoletes; + while ((obs2 = *obsp2++) != 0) + if (obs2 == obs) + break; + if (obs2) + queue_pushunique(q, op); + } + /* also search packages with the same name */ + FOR_PROVIDES(op, opp2, s2->name) + { + Solvable *os = pool->solvables + op; + Id obs2, *obsp2; + if (os->name != s2->name) + continue; + if (!os->obsoletes) + continue; + if (pool->obsoleteusescolors && !pool_colormatch(pool, s2, os)) + continue; + obsp2 = os->repo->idarraydata + os->obsoletes; + while ((obs2 = *obsp2++) != 0) + if (obs2 == obs) + break; + if (obs2) + queue_pushunique(q, op); + } + } + /* find names so that we can build groups */ + queue_init_clone(&qn, q); + prune_to_best_version(solv->pool, &qn); +#if 0 +{ + for (i = 0; i < qn.count; i++) + printf(" + %s\n", pool_solvid2str(pool, qn.elements[i])); +} +#endif + /* filter into name groups */ + qnc = qn.count; + if (qnc == 1) + { + queue_free(&qn); + queue_empty(q); + return; + } + ncnt = 0; + for (i = 0; i < qnc; i++) + { + Id n = pool->solvables[qn.elements[i]].name; + int got = 0; + for (j = 0; j < q->count; j++) + { + Id p = q->elements[j]; + if (pool->solvables[p].name == n) + { + queue_push(&qn, p); + got = 1; + } + } + if (got) + { + queue_push(&qn, 0); + ncnt++; + } + } + if (ncnt <= 1) + { + queue_empty(q); + } + else + { + queue_empty(q); + queue_insertn(q, 0, qn.count - qnc, qn.elements + qnc); + } + queue_free(&qn); +} + +void +solver_addyumobsrules(Solver *solv) +{ + Pool *pool = solv->pool; + Repo *installed = solv->installed; + Id p, op, *opp; + Solvable *s; + Queue qo, qq, yumobsinfoq; + int i, j, k; + unsigned int now; + + solv->yumobsrules = solv->nrules; + if (!installed || !solv->obsoletes) + { + solv->yumobsrules_end = solv->nrules; + return; + } + now = solv_timems(0); + queue_init(&qo); + FOR_REPO_SOLVABLES(installed, p, s) + { + if (!solv->obsoletes[p - installed->start]) + continue; +#if 0 +printf("checking yumobs for %s\n", pool_solvable2str(pool, s)); +#endif + queue_empty(&qo); + for (opp = solv->obsoletes_data + solv->obsoletes[p - installed->start]; (op = *opp++) != 0;) + { + Solvable *os = pool->solvables + op; + Id obs, *obsp = os->repo->idarraydata + os->obsoletes; + Id p2, pp2; + while ((obs = *obsp++) != 0) + { + FOR_PROVIDES(p2, pp2, obs) + { + Solvable *s2 = pool->solvables + p2; + if (s2->repo != installed) + continue; + if (!pool->obsoleteusesprovides && !pool_match_nevr(pool, pool->solvables + p2, obs)) + continue; + if (pool->obsoleteusescolors && !pool_colormatch(pool, s, s2)) + continue; + queue_pushunique(&qo, obs); + break; + } + } + } + } + if (!qo.count) { - FOR_REPO_SOLVABLES(installed, p, s) + queue_free(&qo); + return; + } + queue_init(&yumobsinfoq); + queue_init(&qq); + for (i = 0; i < qo.count; i++) + { + int group, groupk, groupstart; + queue_empty(&qq); +#if 0 +printf("investigating %s\n", pool_dep2str(pool, qo.elements[i])); +#endif + find_obsolete_group(solv, qo.elements[i], &qq); +#if 0 +printf("result:\n"); +for (j = 0; j < qq.count; j++) + if (qq.elements[j] == 0) + printf("---\n"); + else + printf("%s\n", pool_solvid2str(pool, qq.elements[j])); +#endif + + if (!qq.count) + continue; + /* at least two goups, build rules */ + group = 0; + for (j = 0; j < qq.count; j++) { - Id d, p2, pp2; - if (!solv->updatemap_all && (!solv->updatemap.size || !MAPTST(&solv->updatemap, p - installed->start))) - continue; - if (!solv->bestupdatemap_all && (!solv->bestupdatemap.size || !MAPTST(&solv->bestupdatemap, p - installed->start))) - continue; - queue_empty(&q); - if (solv->bestobeypolicy) - r = solv->rules + solv->updaterules + (p - installed->start); - else - { - r = solv->rules + solv->featurerules + (p - installed->start); - if (!r->p) /* identical to update rule? */ - r = solv->rules + solv->updaterules + (p - installed->start); - } - if (solv->multiversionupdaters && (d = solv->multiversionupdaters[p - installed->start]) != 0 && r == solv->rules + solv->updaterules + (p - installed->start)) - { - /* need to check multiversionupdaters */ - if (r->p == p) /* be careful with the dup case */ - queue_push(&q, p); - while ((p2 = pool->whatprovidesdata[d++]) != 0) - queue_push(&q, p2); - } - else + p = qq.elements[j]; + if (!p) { - FOR_RULELITERALS(p2, pp2, r) - if (p2 > 0) - queue_push(&q, p2); + group++; + continue; } - if (solv->update_targets && solv->update_targets->elements[p - installed->start]) - prune_to_update_targets(solv, solv->update_targets->elements + solv->update_targets->elements[p - installed->start], &q); - if (solv->dupinvolvedmap.size && MAPTST(&solv->dupinvolvedmap, p)) - prune_to_dup_packages(solv, p, &q); - /* select best packages, just look at prio and version */ - policy_filter_unwanted(solv, &q, POLICY_MODE_RECOMMEND); - if (!q.count) - continue; /* orphaned */ - if (solv->bestobeypolicy) + if (pool->solvables[p].repo == installed) + continue; + groupk = 0; + groupstart = 0; + for (k = 0; k < qq.count; k++) { - /* also filter the best of the feature rule packages and add them */ - r = solv->rules + solv->featurerules + (p - installed->start); - if (r->p) + Id pk = qq.elements[k]; + if (pk) + continue; + if (group != groupk && k > groupstart) { - int j; - queue_empty(&q2); - FOR_RULELITERALS(p2, pp2, r) - if (p2 > 0) - queue_push(&q2, p2); - if (solv->update_targets && solv->update_targets->elements[p - installed->start]) - prune_to_update_targets(solv, solv->update_targets->elements + solv->update_targets->elements[p - installed->start], &q2); - if (solv->dupinvolvedmap.size && MAPTST(&solv->dupinvolvedmap, p)) - prune_to_dup_packages(solv, p, &q); - policy_filter_unwanted(solv, &q2, POLICY_MODE_RECOMMEND); - for (j = 0; j < q2.count; j++) - queue_pushunique(&q, q2.elements[j]); + /* add the rule */ + if (k - groupstart == 1) + solver_addrule(solv, -p, qq.elements[groupstart], 0); + else + solver_addrule(solv, -p, 0, pool_ids2whatprovides(pool, qq.elements + groupstart, k - groupstart)); + queue_push(&yumobsinfoq, qo.elements[i]); } + groupstart = k + 1; + groupk++; } - p2 = queue_shift(&q); - solver_addrule(solv, p2, q.count ? pool_queuetowhatprovides(pool, &q) : 0); - queue_push(&r2pkg, p); } } - if (r2pkg.count) - solv->bestrules_pkg = solv_memdup2(r2pkg.elements, r2pkg.count, sizeof(Id)); - solv->bestrules_end = solv->nrules; - queue_free(&q); - queue_free(&q2); - queue_free(&r2pkg); + if (yumobsinfoq.count) + solv->yumobsrules_info = solv_memdup2(yumobsinfoq.elements, yumobsinfoq.count, sizeof(Id)); + queue_free(&yumobsinfoq); + queue_free(&qq); + queue_free(&qo); + solv->yumobsrules_end = solv->nrules; + POOL_DEBUG(SOLV_DEBUG_STATS, "yumobs rule creation took %d ms\n", solv_timems(now)); } #undef CLEANDEPSDEBUG @@ -2820,8 +3746,6 @@ dep_pkgcheck(Solver *solv, Id dep, Map *m, Queue *q) } if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_SPLITPROVIDES) return; - if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_INSTALLED) - return; } } FOR_PROVIDES(p, pp, dep) @@ -2853,9 +3777,11 @@ check_xsupp(Solver *solv, Queue *depq, Id dep) return check_xsupp(solv, depq, rd->evr); } if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_SPLITPROVIDES) +#if 0 return solver_splitprovides(solv, rd->evr); - if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_INSTALLED) - return solver_dep_installed(solv, rd->evr); +#else + return 0; +#endif } if (depq && rd->flags == REL_NAMESPACE) { @@ -2881,6 +3807,97 @@ queue_contains(Queue *q, Id id) return 0; } +#ifdef ENABLE_COMPLEX_DEPS +static void +complex_cleandeps_remove(Pool *pool, Id ip, Id req, Map *im, Map *installedm, Queue *iq) +{ + int i; + Queue dq; + Id p; + + queue_init(&dq); + i = pool_normalize_complex_dep(pool, req, &dq, CPLXDEPS_EXPAND); + if (i == 0 || i == 1) + { + queue_free(&dq); + return; + } + for (i = 0; i < dq.count; i++) + { + for (; (p = dq.elements[i]) != 0; i++) + { + if (p < 0) + { + if (!MAPTST(installedm, -p)) + break; + continue; + } + if (p != SYSTEMSOLVABLE && MAPTST(im, p)) + { +#ifdef CLEANDEPSDEBUG + printf("%s requires/recommends %s\n", pool_solvid2str(pool, ip), pool_solvid2str(pool, p)); +#endif + queue_push(iq, p); + } + } + while (dq.elements[i]) + i++; + } + queue_free(&dq); +} + +static void +complex_cleandeps_addback(Pool *pool, Id ip, Id req, Map *im, Map *installedm, Queue *iq, Map *userinstalled) +{ + int i, blk; + Queue dq; + Id p; + + queue_init(&dq); + i = pool_normalize_complex_dep(pool, req, &dq, CPLXDEPS_EXPAND); + if (i == 0 || i == 1) + { + queue_free(&dq); + return; + } + for (i = 0; i < dq.count; i++) + { + blk = i; + for (; (p = dq.elements[i]) != 0; i++) + { + if (p < 0) + { + if (!MAPTST(installedm, -p)) + break; + continue; + } + if (MAPTST(im, p)) + break; + } + if (!p) + { + for (i = blk; (p = dq.elements[i]) != 0; i++) + { + if (p < 0) + continue; + if (!MAPTST(installedm, p)) + continue; + if (p == ip || MAPTST(userinstalled, p - pool->installed->start)) + continue; +#ifdef CLEANDEPSDEBUG + printf("%s requires/recommends %s\n", pool_solvid2str(pool, ip), pool_solvid2str(pool, p)); +#endif + MAPSET(im, p); + queue_push(iq, p); + } + } + while (dq.elements[i]) + i++; + } + queue_free(&dq); +} + +#endif /* * Find all installed packages that are no longer @@ -2970,7 +3987,7 @@ solver_createcleandepsmap(Solver *solv, Map *cleandepsmap, int unneeded) /* have special namespace cleandeps erases */ if (iq.count) { - for (ip = solv->installed->start; ip < solv->installed->end; ip++) + for (ip = installed->start; ip < installed->end; ip++) { s = pool->solvables + ip; if (s->repo != installed) @@ -2979,7 +3996,7 @@ solver_createcleandepsmap(Solver *solv, Map *cleandepsmap, int unneeded) continue; supp = s->repo->idarraydata + s->supplements; while ((sup = *supp++) != 0) - if (check_xsupp(solv, &iq, sup) && !check_xsupp(solv, 0, sup)) + if (ISRELDEP(sup) && check_xsupp(solv, &iq, sup) && !check_xsupp(solv, 0, sup)) { #ifdef CLEANDEPSDEBUG printf("xsupp %s from %s\n", pool_dep2str(pool, sup), pool_solvid2str(pool, ip)); @@ -3030,16 +4047,18 @@ solver_createcleandepsmap(Solver *solv, Map *cleandepsmap, int unneeded) if (!strncmp("product:", pool_id2str(pool, s->name), 8)) { MAPSET(&userinstalled, p - installed->start); - if (pool->nscallback) +#ifdef ENABLE_LINKED_PKGS + if (solv->instbuddy && solv->instbuddy[p - installed->start] > 1) { - Id buddy = pool->nscallback(pool, pool->nscallbackdata, NAMESPACE_PRODUCTBUDDY, p); - if (buddy >= installed->start && buddy < installed->end && pool->solvables[buddy].repo == installed) + Id buddy = solv->instbuddy[p - installed->start]; + if (buddy >= installed->start && buddy < installed->end) MAPSET(&userinstalled, buddy - installed->start); } +#endif } } } - + /* add all positive elements (e.g. locks) to "userinstalled" */ for (rid = solv->jobrules; rid < solv->jobrules_end; rid++) { @@ -3235,14 +4254,12 @@ solver_createcleandepsmap(Solver *solv, Map *cleandepsmap, int unneeded) { if (req == SOLVABLE_PREREQMARKER) continue; -#if 0 - /* count number of installed packages that match */ - count = 0; - FOR_PROVIDES(p, pp, req) - if (MAPTST(&installedm, p)) - count++; - if (count > 1) - continue; +#ifdef ENABLE_COMPLEX_DEPS + if (pool_is_complex_dep(pool, req)) + { + complex_cleandeps_remove(pool, ip, req, &im, &installedm, &iq); + continue; + } #endif FOR_PROVIDES(p, pp, req) { @@ -3261,13 +4278,12 @@ solver_createcleandepsmap(Solver *solv, Map *cleandepsmap, int unneeded) reqp = s->repo->idarraydata + s->recommends; while ((req = *reqp++) != 0) { -#if 0 - count = 0; - FOR_PROVIDES(p, pp, req) - if (MAPTST(&installedm, p)) - count++; - if (count > 1) - continue; +#ifdef ENABLE_COMPLEX_DEPS + if (pool_is_complex_dep(pool, req)) + { + complex_cleandeps_remove(pool, ip, req, &im, &installedm, &iq); + continue; + } #endif FOR_PROVIDES(p, pp, req) { @@ -3295,6 +4311,15 @@ solver_createcleandepsmap(Solver *solv, Map *cleandepsmap, int unneeded) if (pool->solvables[p].repo == installed) MAPSET(&userinstalled, p - installed->start); } + if (!unneeded && solv->cleandeps_updatepkgs) + { + for (i = 0; i < solv->cleandeps_updatepkgs->count; i++) + { + p = solv->cleandeps_updatepkgs->elements[i]; + if (pool->solvables[p].repo == installed) + MAPSET(&userinstalled, p - installed->start); + } + } MAPSET(&im, SYSTEMSOLVABLE); /* in case we cleared it above */ for (p = installed->start; p < installed->end; p++) if (MAPTST(&im, p)) @@ -3367,6 +4392,13 @@ solver_createcleandepsmap(Solver *solv, Map *cleandepsmap, int unneeded) reqp = s->repo->idarraydata + s->requires; while ((req = *reqp++) != 0) { +#ifdef ENABLE_COMPLEX_DEPS + if (pool_is_complex_dep(pool, req)) + { + complex_cleandeps_addback(pool, ip, req, &im, &installedm, &iq, &userinstalled); + continue; + } +#endif FOR_PROVIDES(p, pp, req) if (MAPTST(&im, p)) break; @@ -3374,7 +4406,7 @@ solver_createcleandepsmap(Solver *solv, Map *cleandepsmap, int unneeded) continue; FOR_PROVIDES(p, pp, req) { - if (!MAPTST(&im, p) && MAPTST(&installedm, p)) + if (MAPTST(&installedm, p)) { if (p == ip) continue; @@ -3394,6 +4426,13 @@ solver_createcleandepsmap(Solver *solv, Map *cleandepsmap, int unneeded) reqp = s->repo->idarraydata + s->recommends; while ((req = *reqp++) != 0) { +#ifdef ENABLE_COMPLEX_DEPS + if (pool_is_complex_dep(pool, req)) + { + complex_cleandeps_addback(pool, ip, req, &im, &installedm, &iq, &userinstalled); + continue; + } +#endif FOR_PROVIDES(p, pp, req) if (MAPTST(&im, p)) break; @@ -3401,7 +4440,7 @@ solver_createcleandepsmap(Solver *solv, Map *cleandepsmap, int unneeded) continue; FOR_PROVIDES(p, pp, req) { - if (!MAPTST(&im, p) && MAPTST(&installedm, p)) + if (MAPTST(&installedm, p)) { if (p == ip) continue; @@ -3417,7 +4456,7 @@ solver_createcleandepsmap(Solver *solv, Map *cleandepsmap, int unneeded) } } } - + queue_free(&iq); /* make sure the updatepkgs and mistakes are not in the cleandeps map */ if (solv->cleandeps_updatepkgs) @@ -3504,6 +4543,47 @@ trj_visit(struct trj_data *trj, Id node) } } +#ifdef ENABLE_COMPLEX_DEPS +static void +complex_unneeded(Pool *pool, Id ip, Id req, Queue *edges, Map *cleandepsmap, Queue *unneededq) +{ + int i, j; + Queue dq; + Id p; + + queue_init(&dq); + i = pool_normalize_complex_dep(pool, req, &dq, CPLXDEPS_EXPAND); + if (i == 0 || i == 1) + { + queue_free(&dq); + return; + } + for (i = 0; i < dq.count; i++) + { + for (; (p = dq.elements[i]) != 0; i++) + { + if (p < 0) + { + if (pool->solvables[-p].repo != pool->installed) + break; + continue; + } + if (p == ip || pool->solvables[p].repo != pool->installed || !MAPTST(cleandepsmap, p - pool->installed->start)) + continue; + for (j = 0; j < unneededq->count; j++) + if (p == unneededq->elements[j]) + { + if (edges->elements[edges->count - 1] != j + 1) + queue_push(edges, j + 1); + break; + } + } + while (dq.elements[i]) + i++; + } + queue_free(&dq); +} +#endif void solver_get_unneeded(Solver *solv, Queue *unneededq, int filtered) @@ -3557,31 +4637,37 @@ solver_get_unneeded(Solver *solv, Queue *unneededq, int filtered) for (i = 0; i < count; i++) { Solvable *s = pool->solvables + unneededq->elements[i]; - edges.elements[i + 1] = edges.count; + int oldcount = edges.count; + edges.elements[i + 1] = oldcount; for (pass = 0; pass < 2; pass++) { - int num = 0; unsigned int off = pass == 0 ? s->requires : s->recommends; - Id p, pp, *dp; + Id p, pp, dep, *dp; if (off) - for (dp = s->repo->idarraydata + off; *dp; dp++) - FOR_PROVIDES(p, pp, *dp) - { - Solvable *sp = pool->solvables + p; - if (s == sp || sp->repo != installed || !MAPTST(&cleandepsmap, p - installed->start)) - continue; - for (j = 0; j < count; j++) - if (p == unneededq->elements[j]) - break; - if (j == count) - continue; - if (num && edges.elements[edges.count - 1] == j + 1) + for (dp = s->repo->idarraydata + off; (dep = *dp) != 0; dp++) + { +#ifdef ENABLE_COMPLEX_DEPS + if (pool_is_complex_dep(pool, dep)) + { + complex_unneeded(pool, s - pool->solvables, dep, &edges, &cleandepsmap, unneededq); continue; - queue_push(&edges, j + 1); - num++; - } - if (pass == 0) - nrequires[i] = num; + } +#endif + FOR_PROVIDES(p, pp, dep) + { + Solvable *sp = pool->solvables + p; + if (s == sp || sp->repo != installed || !MAPTST(&cleandepsmap, p - installed->start)) + continue; + for (j = 0; j < count; j++) + if (p == unneededq->elements[j]) + { + if (edges.elements[edges.count - 1] != j + 1) + queue_push(&edges, j + 1); + } + } + } + if (pass == 0) + nrequires[i] = edges.count - oldcount; } queue_push(&edges, 0); } @@ -3623,8 +4709,8 @@ solver_get_unneeded(Solver *solv, Queue *unneededq, int filtered) /* now add edge from j + 1 to i + 1 */ queue_insert(&edges, edges.elements[j + 1] + nrequires[j], i + 1); /* addapt following edge pointers */ - for (k = j + 2; k < count + 2; k++) - edges.elements[k]++; + for (j = j + 2; j < count + 1; j++) + edges.elements[j]++; } queue_free(&iq); } @@ -3639,7 +4725,7 @@ solver_get_unneeded(Solver *solv, Queue *unneededq, int filtered) printf(" %s (%d requires):\n", pool_solvid2str(pool, unneededq->elements[i]), nrequires[i]); for (j = edges.elements[i + 1]; edges.elements[j]; j++) printf(" - %s\n", pool_solvid2str(pool, unneededq->elements[edges.elements[j] - 1])); - } + } #endif map_free(&installedm); @@ -3705,4 +4791,96 @@ solver_get_unneeded(Solver *solv, Queue *unneededq, int filtered) map_free(&cleandepsmap); } -/* EOF */ + +void +solver_breakorphans(Solver *solv) +{ + Pool *pool = solv->pool; + Repo *installed = solv->installed; + int i, rid; + Map m; + + if (!installed || solv->droporphanedmap_all) + return; + solv->brokenorphanrules = solv_calloc(1, sizeof(Queue)); + queue_init(solv->brokenorphanrules); + map_init(&m, installed->end - installed->start); + for (i = 0; i < solv->orphaned.count; i++) + { + Id p = solv->orphaned.elements[i]; + if (pool->solvables[p].repo != installed) + continue; + if (solv->droporphanedmap.size && MAPTST(&solv->droporphanedmap, p - installed->start)) + continue; + MAPSET(&m, p - installed->start); + } + for (rid = 1; rid < solv->pkgrules_end ; rid++) + { + Id p, *dp; + Rule *r = solv->rules + rid; + /* ignore non-deps and simple conflicts */ + if (r->p >= 0 || ((r->d == 0 || r->d == -1) && r->w2 < 0)) + continue; + p = -r->p; + if (p < installed->start || p >= installed->end || !MAPTST(&m, p - installed->start)) + { + /* need to check other literals */ + if (r->d == 0 || r->d == -1) + continue; + for (dp = pool->whatprovidesdata + (r->d < 0 ? -r->d - 1 : r->d); *dp < 0; dp++) + { + p = -*dp; + if (p >= installed->start && p < installed->end && MAPTST(&m, p - installed->start)) + break; + } + if (*dp >= 0) + continue; + } + /* ok, disable this rule */ + queue_push(solv->brokenorphanrules, rid); + if (r->d >= 0) + solver_disablerule(solv, r); + } + map_free(&m); + if (!solv->brokenorphanrules->count) + { + queue_free(solv->brokenorphanrules); + solv->brokenorphanrules = solv_free(solv->brokenorphanrules); + } +} + +void +solver_check_brokenorphanrules(Solver *solv, Queue *dq) +{ + Pool *pool = solv->pool; + int i; + Id l, pp; + + queue_empty(dq); + if (!solv->brokenorphanrules) + return; + for (i = 0; i < solv->brokenorphanrules->count; i++) + { + int rid = solv->brokenorphanrules->elements[i]; + Rule *r = solv->rules + rid; + FOR_RULELITERALS(l, pp, r) + { + if (l < 0) + { + if (solv->decisionmap[-l] <= 0) + break; + } + else + { + if (solv->decisionmap[l] > 0 && pool->solvables[l].repo != solv->installed) + break; + } + } + if (l) + continue; + FOR_RULELITERALS(l, pp, r) + if (l > 0 && solv->decisionmap[l] == 0 && pool->solvables[l].repo != solv->installed) + queue_pushunique(dq, l); + } +} +