From 324d9acab722ae6e3819203ceaa2ec46ad1fef3a Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 7 May 2019 01:21:24 +0200 Subject: [PATCH] machinectl/loginctl: show json output if requested even if zero entries --- src/login/loginctl.c | 2 +- src/machine/machinectl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/login/loginctl.c b/src/login/loginctl.c index 342ac56d904..3db7224623b 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -94,7 +94,7 @@ static int show_table(Table *table, const char *word) { assert(table); assert(word); - if (table_get_rows(table) > 1) { + if (table_get_rows(table) > 1 || OUTPUT_MODE_IS_JSON(arg_output)) { r = table_set_sort(table, (size_t) 0, (size_t) -1); if (r < 0) return log_error_errno(r, "Failed to sort table: %m"); diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index d98027a0ca5..693184f0a1e 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -255,7 +255,7 @@ static int show_table(Table *table, const char *word) { assert(table); assert(word); - if (table_get_rows(table) > 1) { + if (table_get_rows(table) > 1 || OUTPUT_MODE_IS_JSON(arg_output)) { r = table_set_sort(table, (size_t) 0, (size_t) -1); if (r < 0) return log_error_errno(r, "Failed to sort table: %m"); -- 2.47.3