1 --- pkgset-install.c 16 Nov 2002 00:23:22 -0000 1.82
2 +++ pkgset-install.c 16 Jul 2003 10:55:04 -0000 1.82.4.1
5 if (p != pkg && pkg_is_marked(p)) {
6 if (req == NULL || pkg_statisfies_req(p, req, 0)) {
7 - DBGF("%s -> yes, %s\n", pkg_snprintf_s0(pkg), pkg_snprintf_s1(p));
9 + DBGF("%s -> yes, %s\n", pkg_snprintf_s0(pkg), pkg_snprintf_s1(p));
19 struct pkg **candidates, int npkgs,
20 struct pkgset *ps, struct upgrade_s *upg)
22 - int *ncnfls, i, j, i_min, cnfl_min;
23 + int *ncnfls, i, j, i_best, cnfl_min;
24 int i_ver_eq = -1, i_evr_eq = -1;
26 DBGF("%s (%d)\n", pkg_snprintf_s(marker), npkgs);
33 for (i=0; i < npkgs; i++) {
34 DBGF("%d. %s %d\n", i, pkg_snprintf_s(candidates[i]), ncnfls[i]);
35 if (cnfl_min > ncnfls[i]) {
42 - DBGF("[after cnfls] i_min = %d\n", i_min);
43 + DBGF("[after cnfls] i_best = %d\n", i_best);
45 int n = INT_MAX, *nmarks;
47 nmarks = alloca(npkgs * sizeof(*nmarks));
49 for (i=0; i < npkgs; i++) {
50 + if (other_version_marked(candidates[i], ps->pkgs, NULL)) {
51 + DBGF("%d. %s other version is already marked, skipped\n",
52 + i, pkg_snprintf_s(candidates[i]));
56 nmarks[i] = pkg_drags(candidates[i], ps, upg);
57 - DBGF("%d %s -> %d\n", i, pkg_snprintf_s(candidates[i]), nmarks[i]);
58 - if (n > nmarks[i]) {
59 + DBGF("%d. %s -> %d\n", i, pkg_snprintf_s(candidates[i]), nmarks[i]);
65 if (n == 0 && ncnfls[i] == 0) {
78 + DBGF("RET %d. %s\n", i_best, pkg_snprintf_s(candidates[i]));
82 #define FINDREQ_BESTSEL 0
84 capreq_snprintf(reqname, 256, req);
87 - DBGF("req %s\n", capreq_snprintf_s(req));
88 + DBGF("%s: REQ %s\n", pkg_snprintf_s(pkg), capreq_snprintf_s(req));
90 if ((upg->inst->flags & INSTS_EQPKG_ASKUSER) && upg->inst->askpkg_fn)
91 tomark_candidates_ptr = &tomark_candidates;
97 + DBGF("%s: TOMARK %s\n", pkg_snprintf_s1(pkg),
98 + tomark ? pkg_snprintf_s0(tomark) : "NULL");
99 /* don't check foreign dependencies */
100 if (process_as == PROCESS_AS_ORPHAN) {
101 #if 0 /* buggy, TODO - unmark foreign on adding to uninst_set */