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."

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);