]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
journalctl: honor --quiet when vacuuming (#6771)
authorKai-Heng Feng <kaihengfeng@gmail.com>
Fri, 8 Sep 2017 12:25:44 +0000 (20:25 +0800)
committerLennart Poettering <lennart@poettering.net>
Fri, 8 Sep 2017 12:25:44 +0000 (14:25 +0200)
'journalctl --vacuum-*' does not suppress output message with --quiet.

Let journal_directory_vacuum honors --quiet to fix the problem.

BugLink: https://bugs.launchpad.net/bugs/1692188
src/journal/journalctl.c

index 2313c8c6786dceb17153e284f5751bc7374c2cdd..1bb4d891594234d8071e4283a059069f1e417c80 100644 (file)
@@ -2170,7 +2170,7 @@ int main(int argc, char *argv[]) {
                         if (d->is_root)
                                 continue;
 
-                        q = journal_directory_vacuum(d->path, arg_vacuum_size, arg_vacuum_n_files, arg_vacuum_time, NULL, true);
+                        q = journal_directory_vacuum(d->path, arg_vacuum_size, arg_vacuum_n_files, arg_vacuum_time, NULL, !arg_quiet);
                         if (q < 0) {
                                 log_error_errno(q, "Failed to vacuum %s: %m", d->path);
                                 r = q;