1 commit e7a7215898ec0c15ac5572d292a378f4a2cffdeb
2 Author: Marcin Banasiak <megabajt@pld-linux.org>
3 Date: Mon Feb 23 22:42:43 2009 +0100
5 On upgrade don't suggest packages skipped during instalation.
7 This change implements future described in this thread:
9 http://lists.pld-linux.org/mailman/pipermail/pld-devel-pl/2008-June/145262.html
11 Currently it is enabled by default and there is no way to disable this
12 behaviour. Should it be possible?
14 diff --git a/install3/requirements.c b/install3/requirements.c
15 index dbb3092..bfbe481 100644
16 --- a/install3/requirements.c
17 +++ b/install3/requirements.c
18 @@ -595,6 +595,7 @@ static int process_req(int indent, struct i3ctx *ictx,
19 static tn_array *with_suggests(int indent, struct i3ctx *ictx, struct pkg *pkg)
21 tn_array *suggests = NULL, *choices = NULL;
22 + struct pkg *oldpkg = NULL;
23 int i, autochoice = 0;
25 if (pkg->sugs == NULL)
26 @@ -618,12 +619,15 @@ static tn_array *with_suggests(int indent, struct i3ctx *ictx, struct pkg *pkg)
28 tracef(indent, "%s", pkg_id(pkg));
30 + /* gets old version of pkg (from marked for removal) */
31 + oldpkg = iset_has_kind_of_pkg(ictx->unset, pkg);
33 suggests = capreq_arr_new(4);
34 n_array_ctl_set_freefn(suggests, NULL); /* 'weak' ref */
35 for (i=0; i < n_array_size(pkg->sugs); i++) {
36 struct capreq *req = n_array_nth(pkg->sugs, i);
37 struct pkg *tomark = NULL;
40 if (iset_provides(ictx->inset, req)) {
41 trace(indent, "- %s: already marked", capreq_stra(req));
43 @@ -633,6 +637,13 @@ static tn_array *with_suggests(int indent, struct i3ctx *ictx, struct pkg *pkg)
44 trace(indent, "- %s: satisfied by db", capreq_stra(req));
48 + /* on upgrade don't suggest package skipped during installation */
49 + if (oldpkg && oldpkg->sugs && capreq_arr_contains(oldpkg->sugs, capreq_name(req))) {
50 + trace(indent, "- %s: skipped on install -> don't suggest on upgrade",
55 if (!i3_find_req(indent, ictx, pkg, req, &tomark, NULL)) {
56 logn(LOGWARN, _("%s: suggested %s not found, skipped"), pkg_id(pkg),