From: Kai-Heng Feng <kaihengfeng@gmail.com>
Date: Fri, 8 Sep 2017 12:25:44 +0000 (+0800)
Subject: journalctl: honor --quiet when vacuuming (#6771)
X-Git-Tag: v235~142
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e3695e499a54071aa5fa3b79bdbff0be2c528204;p=thirdparty%2Fsystemd.git

journalctl: honor --quiet when vacuuming (#6771)

'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
---

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 2313c8c6786..1bb4d891594 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -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;