util-linux/backport-lscpu-fix-p-output-all-caches-delimiter.patch
zhangyao f63973e5e5 sync community patches
(cherry picked from commit 1efe7bf26406dfed2dc9304835801f62f5e8a558)
2023-06-06 09:47:09 +08:00

35 lines
1.1 KiB
Diff

From 0da947eb78e3f37f63f33157562c221805ec7fe9 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Mon, 17 Apr 2023 10:50:08 +0200
Subject: [PATCH] lscpu: fix -p --output-all caches delimiter
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2187099
Signed-off-by: Karel Zak <kzak@redhat.com>
---
sys-utils/lscpu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 3f28db61c..8333dcbea 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -1444,6 +1444,7 @@ int main(int argc, char *argv[])
print_cpus_readable(cxt, columns, ncolumns);
break;
case LSCPU_OUTPUT_PARSABLE:
+ cxt->show_compatible = 1;
if (!ncolumns) {
columns[ncolumns++] = COL_CPU_CPU;
columns[ncolumns++] = COL_CPU_CORE;
@@ -1453,7 +1454,6 @@ int main(int argc, char *argv[])
columns[ncolumns++] = COL_CPU_SOCKET;
columns[ncolumns++] = COL_CPU_NODE;
columns[ncolumns++] = COL_CPU_CACHE;
- cxt->show_compatible = 1;
}
if (outarg && string_add_to_idarray(outarg, columns,
ARRAY_SIZE(columns),
--
2.27.0