machinectl/loginctl: show json output if requested even if zero entries

diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 342ac56d90437e022179ab04ab9686c607b54525..3db7224623bb45ddf7f9b39fedb7831e7d3325dc 100644 (file)
--- 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 d98027a0ca5fdd63246f8498b960d1373743910d..693184f0a1e28a5686b73ace36cfbfe1e70782b0 100644 (file)
--- 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");