diff options
| author | Paul W. Frields <stickster@gmail.com> | 2013-02-24 15:27:51 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-02-24 15:28:37 +0100 |
| commit | 3ba09ee8eb9453daf9228f612c9bcd59905fcf05 (patch) | |
| tree | 4fede48ea1db1d7eb2546dbfc50495dee1540ba2 /src/journal/journalctl.c | |
| parent | cb96a2c69a312fb089fef4501650f4fc40a1420b (diff) | |
journal: fix --until
https://bugs.freedesktop.org/show_bug.cgi?id=58946
Diffstat (limited to 'src/journal/journalctl.c')
| -rw-r--r-- | src/journal/journalctl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 0afeef932e..0b3a79bee9 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -433,7 +433,7 @@ static int parse_argv(int argc, char *argv[]) { if (arg_follow && !arg_no_tail && arg_lines < 0) arg_lines = 10; - if (arg_since_set && arg_until_set && arg_since_set > arg_until_set) { + if (arg_since_set && arg_until_set && arg_since > arg_until) { log_error("--since= must be before --until=."); return -EINVAL; } @@ -1076,6 +1076,8 @@ int main(int argc, char *argv[]) { log_error("Failed to determine timestamp: %s", strerror(-r)); goto finish; } + if (usec > arg_until) + goto finish; } if (!arg_merge) { |