journalctl: skip informational messages in export/json modes

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 34017484be49fb67a980c166da353a7f035b32b5..9fbc9a3489ef846d8c9d5f03f327f5b66e70c80d 100644 (file)
--- 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) {
                 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;
                         }
 
                                 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':
                         break;
 
                 case 'a':