projects / packages / rpm.git / blame
| Commit | Line | Data |
|---|---|---|
| 70f8787d JR |
1 | --- rpm-5.4.8/rpmdb/hdrfmt.c.suggests~ 2012-04-25 17:58:22.721144146 +0200 |
| 2 | +++ rpm-5.4.8/rpmdb/hdrfmt.c 2012-04-25 18:33:32.293704707 +0200 | |
| 3 | @@ -1607,6 +1607,38 @@ static const char * bfstring(unsigned in | |
| 4 | #endif | |
| 5 | ||
| 6 | /** | |
| 7 | + * Format dependency flags for display. | |
| 8 | + * @param he tag container | |
| 9 | + * @param av parameter list (or NULL) | |
| 10 | + * @return formatted string | |
| 11 | + */ | |
| 12 | +static /*@only@*/ | |
| 13 | +char * hintFormat(HE_t he, /*@unused@*/ /*@null@*/ const char ** av) | |
| 14 | + /*@*/ | |
| 15 | +{ | |
| 16 | + int ix = (he->ix > 0 ? he->ix : 0); | |
| 17 | + char * val; | |
| 18 | + | |
| 19 | +assert(ix == 0); | |
| 20 | + if (he->t != RPM_UINT64_TYPE) { | |
| 21 | + val = xstrdup(_("(invalid type)")); | |
| 22 | + } else { | |
| 23 | + rpmuint64_t anint = he->p.ui64p[ix]; | |
| 24 | + char *t, *buf; | |
| 25 | + | |
| 26 | + t = buf = alloca(32); | |
| 27 | + *t = '\0'; | |
| 28 | + | |
| 29 | + if (anint & RPMSENSE_MISSINGOK) | |
| 30 | + t = stpcpy(t, "(hint)"); | |
| 31 | + *t = '\0'; | |
| 32 | + | |
| 33 | + val = xstrdup(buf); | |
| 34 | + } | |
| 35 | + | |
| 36 | + return val; | |
| 37 | +} | |
| 38 | +/** | |
| 39 | * Retrieve install prefixes. | |
| 40 | * @param h header | |
| 41 | * @retval *he tag container | |
| 42 | @@ -5201,6 +5233,8 @@ static struct headerSprintfExtension_s _ | |
| 43 | { .fmtFunction = digestFormat } }, | |
| 44 | { HEADER_EXT_FORMAT, "fflags", | |
| 45 | { .fmtFunction = fflagsFormat } }, | |
| 46 | + { HEADER_EXT_FORMAT, "hint", | |
| 47 | + { .fmtFunction = hintFormat } }, | |
| 48 | { HEADER_EXT_FORMAT, "iconv", | |
| 49 | { .fmtFunction = iconvFormat } }, | |
| 50 | { HEADER_EXT_FORMAT, "json", | |
| 51 | --- rpm-5.4.8/rpmpopt.in.suggests~ 2012-04-25 17:58:22.439141788 +0200 | |
| 52 | +++ rpm-5.4.8/rpmpopt.in 2012-04-25 18:33:32.295704719 +0200 | |
| 53 | @@ -98,7 +98,8 @@ rpm alias --provides --qf \ | |
| 54 | --POPTdesc=$"list capabilities that this package provides" | |
| 55 | ||
| 56 | rpm alias --requires --qf \ | |
| 57 | - "[%{REQUIRENAME}%{REQUIREFLAGS:depflags}%{REQUIREVERSION}\n]" \ | |
| 58 | + "[%{REQUIRENAME}%{REQUIREFLAGS:hint:depflags}%{REQUIREVERSION}\n]" \ | |
| 59 | + --pipe "grep -v \(hint\)" \ | |
| 60 | --POPTdesc=$"list capabilities required by package(s)" | |
| 61 | rpm alias -R --requires | |
| 62 |