From: Stef Walter <stefw@redhat.com>
Date: Fri, 14 Aug 2015 14:38:41 +0000 (+0200)
Subject: journalctl: make sure 'journalctl -f -t unmatched' blocks
X-Git-Tag: v225~55^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F958%2Fhead;p=thirdparty%2Fsystemd.git

journalctl: make sure 'journalctl -f -t unmatched' blocks

Previously the following command:

$ journalctl -f -t unmatchedtag12345

... would block when called with criteria that did not match any
journal lines. Once log lines appeared that matched the criteria
they were displayed.

Commit 02ab86c732576a71179ce12e97d44c289833236d broke this
behavior and the journal was not followed, but the command
exits with '-- No entries --' displayed.

This commit fixes the issue.

More information downstream:

https://bugzilla.redhat.com/show_bug.cgi?id=1253649
---

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index fe83edd2b3d..ce2dd9da26c 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -2066,8 +2066,12 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
         if (r == 0) {
-                printf("-- No entries --\n");
-                goto finish;
+                if (arg_follow)
+                        need_seek = true;
+                else {
+                        printf("-- No entries --\n");
+                        goto finish;
+                }
         }
 
         if (!arg_follow)