From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 11 Apr 2024 17:04:14 +0000 (+0200)
Subject: journalctl: show human readable text if no namespace is found
X-Git-Tag: v256-rc1~169^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1005cae75e146264411865d43ef4bbbc5015280;p=thirdparty%2Fsystemd.git

journalctl: show human readable text if no namespace is found

The common case will be that no namespaces are defined, hence by default
we'd just output "NAMESPACE" and exit, which is very confusing.

Generate a nice message instead, how many of our tools do it. Suppress
it on --quiet however.
---

diff --git a/src/journal/journalctl-misc.c b/src/journal/journalctl-misc.c
index c7a49eefea2..9d878e8e056 100644
--- a/src/journal/journalctl-misc.c
+++ b/src/journal/journalctl-misc.c
@@ -261,9 +261,14 @@ int action_list_namespaces(void) {
                 }
         }
 
-        r = table_print_with_pager(table, arg_json_format_flags, arg_pager_flags, !arg_quiet);
-        if (r < 0)
-                return table_log_print_error(r);
+        if (table_isempty(table) && FLAGS_SET(arg_json_format_flags, JSON_FORMAT_OFF)) {
+                if (!arg_quiet)
+                        log_notice("No namespaces found.");
+        } else {
+                r = table_print_with_pager(table, arg_json_format_flags, arg_pager_flags, !arg_quiet);
+                if (r < 0)
+                        return r;
+        }
 
         return 0;
 }