[systemd-commits] src/journal

[Zbigniew Jędrzejewski-Szmek]

 src/journal/journalctl.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit edfb521a21c44f7b4c91d4ef6bffd84f2c241363
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Mon Oct 15 16:14:09 2012 +0000

    journalctl: skip informational messages in export/json modes

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 3401748..9fbc9a3 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -193,10 +193,17 @@ static int parse_argv(int argc, char *argv[]) {
                 case 'o':
                         arg_output = output_mode_from_string(optarg);
                         if (arg_output < 0) {
-                                log_error("Unknown output '%s'.", optarg);
+                                log_error("Unknown output format '%s'.", optarg);
                                 return -EINVAL;
                         }
 
+                        if (arg_output == OUTPUT_EXPORT ||
+                            arg_output == OUTPUT_JSON ||
+                            arg_output == OUTPUT_JSON_PRETTY ||
+                            arg_output == OUTPUT_JSON_SSE ||
+                            arg_output == OUTPUT_CAT)
+                                arg_quiet = true;
+
                         break;
 
                 case 'a':