01/04: ui: Set 'LESS' environment variable unconditionally.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit e66f243e929bbd94e62e77cfa6a63dfd001ebe07
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun Jun 14 11:46:17 2020 +0200

    ui: Set 'LESS' environment variable unconditionally.
    
    Fixes <https://bugs.gnu.org/41811>.
    Reported by Lars-Dominik Braun <lars@6xq.net>.
    
    * guix/ui.scm (call-with-paginated-output-port): Remove (getenv "LESS")
    call.
---
 guix/ui.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/guix/ui.scm b/guix/ui.scm
index 98b3044..7690f48 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -1562,9 +1562,9 @@ zero means that PACKAGE does not match any of REGEXPS."
   (if (isatty?* (current-output-port))
       ;; Set 'LESS' so that 'less' exits if everything fits on the screen (F),
       ;; lets ANSI escapes through (r), does not send the termcap
-      ;; initialization string (X).
-      (let ((pager (with-environment-variables `(("LESS"
-                                                  ,(or (getenv "LESS") "FrX")))
+      ;; initialization string (X).  Set it unconditionally because some
+      ;; distros set it to something that doesn't work here.
+      (let ((pager (with-environment-variables `(("LESS" "FrX"))
                      (open-pipe* OPEN_WRITE
                                  (or (getenv "GUIX_PAGER") (getenv "PAGER")
                                      "less")))))