Journalctl says "no entries" even when told to be quiet (#1293062)

Resolves: #1293062
This commit is contained in:
Jan Synacek 2016-01-07 14:08:45 +01:00
parent e40f4d2f65
commit 69066a593d
2 changed files with 28 additions and 0 deletions

View File

@ -0,0 +1,26 @@
From 32ea8df8a957bec913087cb9c34f662d7d890fc1 Mon Sep 17 00:00:00 2001
From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Tue, 17 Nov 2015 06:06:52 +0000
Subject: [PATCH 3/4] journalctl: don't print -- No entries -- in quiet mode
---
src/journal/journalctl.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 5c058dd..a8e0f01 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -2070,7 +2070,8 @@ int main(int argc, char *argv[]) {
if (arg_follow)
need_seek = true;
else {
- printf("-- No entries --\n");
+ if (!arg_quiet)
+ printf("-- No entries --\n");
goto finish;
}
}
--
2.5.0

View File

@ -105,6 +105,7 @@ Patch0069: 0054-logind-never-select-closing-sessions-for-a-VT.patch
Patch0070: 0055-logind-release-VT-positions-when-closing-sessions.patch
Patch0071: 0071-nspawn-Don-t-pass-uid-mount-option-for-devpts.patch
Patch0072: 0072-journalctl-make-sure-journalctl-f-t-unmatched-blocks.patch
Patch0073: 0073-journalctl-don-t-print-No-entries-in-quiet-mode.patch
Patch997: 0001-Re-apply-walters-unit-patch-for-F23-systemd-v222.patch
Patch998: 0001-Revert-core-mount-add-dependencies-to-dynamically-mo-v222.patch
@ -848,6 +849,7 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
* Thu Jan 7 2016 Jan Synáček <jsynacek@redhat.com> - 222-12
- Terminal multiplexers (tmux, screen) are broken in systemd-nspawn containers (#1282626)
- Regression: journalctl -f broken (again) with initially empty filter result (#1292805)
- Journalctl says "no entries" even when told to be quiet (#1293062)
* Tue Jan 5 2016 Jan Synáček <jsynacek@redhat.com> - 222-11
- re-apply patches that were removed by mistake (#1263208)