From: Karel Zak <kzak@redhat.com>
Date: Thu, 12 Oct 2023 22:03:15 +0000 (+0200)
Subject: lscpu: fix caches separator for --parse=<list>
X-Git-Tag: v2.39.3~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da18b31ff1cb504e3d288f77d1f1d1179c39e4d8;p=thirdparty%2Futil-linux.git

lscpu: fix caches separator for --parse=<list>

Fixes: https://github.com/util-linux/util-linux/issues/2544
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 8333dcbea6..1e61cc7592 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -1455,10 +1455,13 @@ int main(int argc, char *argv[])
 			columns[ncolumns++] = COL_CPU_NODE;
 			columns[ncolumns++] = COL_CPU_CACHE;
 		}
-		if (outarg && string_add_to_idarray(outarg, columns,
+		if (outarg) {
+			if (string_add_to_idarray(outarg, columns,
 					ARRAY_SIZE(columns),
 					&ncolumns, cpu_column_name_to_id) < 0)
-			return EXIT_FAILURE;
+				return EXIT_FAILURE;
+			cxt->show_compatible = 0;
+		}
 
 		print_cpus_parsable(cxt, columns, ncolumns);
 		break;