diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2007-10-31 10:37:18 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2007-10-31 10:37:18 +0200 |
| commit | c13ab3401614249d8321b9e920a479602dc8291d (patch) | |
| tree | 85522b73dead77b66581b274fcacd40119d0f1d7 /lib/rpmgi.c | |
| parent | 68dcdd5dad79481bd5561ba6b0556bdb84b66c15 (diff) | |
| download | rpm-c13ab3401614249d8321b9e920a479602dc8291d.tar.gz rpm-c13ab3401614249d8321b9e920a479602dc8291d.tar.bz2 rpm-c13ab3401614249d8321b9e920a479602dc8291d.zip | |
Add rpmtsPrintSuggests() method for now, use instead of ts internals mucking
- temporary measure to get rid of silly RPMTS_INTERNAL uses, the whole
solve/suggestion thingie needs love or ripping...
- clean up the suggestions in rpmtsClean() instead of while printing
Diffstat (limited to 'lib/rpmgi.c')
| -rw-r--r-- | lib/rpmgi.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/lib/rpmgi.c b/lib/rpmgi.c index 633e56b7d..17f773a32 100644 --- a/lib/rpmgi.c +++ b/lib/rpmgi.c @@ -6,7 +6,6 @@ #include "rpmlib.h" #include "rpmte.h" /* XXX rpmElementType */ -#define _RPMTS_INTERNAL /* XXX ts->probs et al */ #include "rpmgi_internal.h" #include "rpmdb.h" @@ -569,7 +568,6 @@ enditer: if (gi->flags & RPMGI_TSORDER) { rpmts ts = gi->ts; rpmps ps; - int i; /* XXX installed database needs close here. */ xx = rpmtsCloseDB(ts); @@ -585,21 +583,9 @@ enditer: if (rpmIsVerbose()) rpmpsPrint(NULL, ps); - if (ts->suggests != NULL && ts->nsuggests > 0) { - rpmlog(RPMLOG_INFO, _(" Suggested resolutions:\n")); - for (i = 0; i < ts->nsuggests; i++) { - const char * str = ts->suggests[i]; - if (str == NULL) - break; - - rpmlog(RPMLOG_INFO, "\t%s\n", str); - - ts->suggests[i] = NULL; - str = _free(str); - } - ts->suggests = _free(ts->suggests); - } + if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOSUGGEST)) + rpmtsPrintSuggests(ts); } ps = rpmpsFree(ps); |