summaryrefslogtreecommitdiff
path: root/src/journal
diff options
context:
space:
mode:
authorZbigniew Jedrzejewski-Szmek <zbyszek@in.waw.pl>2012-07-20 09:06:26 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2012-07-23 17:57:11 +0200
commitfafb6eccc2c9e3f8d6ce0aad9cb428f8cc402b24 (patch)
tree1cf54ff0d9fa2a6d5cf36b13d8511caa0b5fc4c8 /src/journal
parentf84b1a8c3aff81c9d80f47943e116e205c884565 (diff)
journalctl: fix ellipsization with PAGER=cat
There are other reasons for not opening the pager then the --no-pager or --follow options (described below). If the pager is not used, messages must be ellipsized. On Fri, Jul 20, 2012 at 05:42:44AM +0000, Shawn Landen wrote: > "Pager to use when --no-pager is not given; overrides $PAGER. > Setting this to an empty string or the value cat is equivalent to passing --no-pager."
Diffstat (limited to 'src/journal')
-rw-r--r--src/journal/journalctl.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index e9810c9a3d..e633dd34d7 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -398,11 +398,7 @@ int main(int argc, char *argv[]) {
goto finish;
}
- have_pager = !arg_no_pager && !arg_follow;
- if (have_pager) {
- columns();
- pager_open();
- }
+ have_pager = !arg_no_pager && !arg_follow && pager_open();
if (arg_output == OUTPUT_JSON) {
fputc('[', stdout);