From: Heiko Carstens Date: Wed, 22 Jun 2016 07:25:56 +0000 (+0200) Subject: lscpu: fix typo in summary output X-Git-Tag: v2.29-rc1~179 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=156740ca3779faf4aa58deb7cde2ffd356a1bd5c;p=thirdparty%2Futil-linux.git lscpu: fix typo in summary output The new drawer support did have a type in the summary output: it reported Drawers(s) instead of Drawer(s). Fix this. Signed-off-by: Heiko Carstens --- diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c index 41316ccafe..c07b9d0968 100644 --- a/sys-utils/lscpu.c +++ b/sys-utils/lscpu.c @@ -1696,7 +1696,7 @@ print_summary(struct lscpu_desc *desc, struct lscpu_modifier *mod) if (desc->ndrawers) { print_n(_("Book(s) per drawer:"), books_per_drawer ?: desc->nbooks / desc->ndrawers); - print_n(_("Drawers(s):"), drawers ?: desc->ndrawers); + print_n(_("Drawer(s):"), drawers ?: desc->ndrawers); } else { print_n(_("Book(s):"), books_per_drawer ?: desc->nbooks); } diff --git a/tests/expected/lscpu/lscpu-s390-lpar-drawer b/tests/expected/lscpu/lscpu-s390-lpar-drawer index 1624e73dd3..accbff8210 100644 --- a/tests/expected/lscpu/lscpu-s390-lpar-drawer +++ b/tests/expected/lscpu/lscpu-s390-lpar-drawer @@ -5,7 +5,7 @@ Thread(s) per core: 1 Core(s) per socket: 8 Socket(s) per book: 3 Book(s) per drawer: 2 -Drawers(s): 4 +Drawer(s): 4 NUMA node(s): 1 Vendor ID: IBM/S390 Model name: 0