diff options
| -rw-r--r-- | src/enquiry.c | 9 | ||||
| -rw-r--r-- | src/select.c | 7 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/enquiry.c b/src/enquiry.c index 0d5e560f5..914f898b9 100644 --- a/src/enquiry.c +++ b/src/enquiry.c @@ -151,7 +151,7 @@ static void describebriefly(struct pkginfo *pkg) { pdesc = pkg_summary(pkg, &pkg->installed, &l); l = min(l, maxl); - printf(" %-20s %.*s\n", pkg->set->name, l, pdesc); + printf(" %-20s %.*s\n", pkg_name(pkg, pnaw_nonambig), l, pdesc); } int @@ -280,12 +280,15 @@ unpackchk(const char *const *argv) while (width > 59) { putchar(' '); width--; } it = pkg_db_iter_new(); while ((pkg = pkg_db_iter_next_pkg(it))) { + const char *pkgname; + if (!yettobeunpacked(pkg,&thissect)) continue; if (strcasecmp(thissect,se->name)) continue; - width -= strlen(pkg->set->name); + pkgname = pkg_name(pkg, pnaw_nonambig); + width -= strlen(pkgname); width--; if (width < 4) { printf(" ..."); break; } - printf(" %s", pkg->set->name); + printf(" %s", pkgname); } pkg_db_iter_free(it); putchar('\n'); diff --git a/src/select.c b/src/select.c index 123519ef3..4ea57d54b 100644 --- a/src/select.c +++ b/src/select.c @@ -42,16 +42,17 @@ #include "main.h" static void getsel1package(struct pkginfo *pkg) { + const char *pkgname; int l; if (pkg->want == want_unknown) return; - l = strlen(pkg->set->name); + pkgname = pkg_name(pkg, pnaw_nonambig); + l = strlen(pkgname); l >>= 3; l = 6 - l; if (l < 1) l = 1; - printf("%s%.*s%s\n", pkg->set->name, l, "\t\t\t\t\t\t", - wantinfos[pkg->want].name); + printf("%s%.*s%s\n", pkgname, l, "\t\t\t\t\t\t", wantinfos[pkg->want].name); } int |