diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-01-13 01:40:04 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-01-13 01:40:04 +0100 |
| commit | 6764f94317be05d2c3b08acdcbb2c4730f0c617d (patch) | |
| tree | adcfd0000cbe9a8c614181e39d7cbe7f1e1bc164 /guix/ui.scm | |
| parent | 67ff2bdf6100cc887b0d5aebbcd1f539c634a3dc (diff) | |
| parent | 1710ffa4c79c79079ebd4e523eef8883eb2d3953 (diff) | |
| download | gnu-guix-6764f94317be05d2c3b08acdcbb2c4730f0c617d.tar gnu-guix-6764f94317be05d2c3b08acdcbb2c4730f0c617d.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/ui.scm')
| -rw-r--r-- | guix/ui.scm | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/guix/ui.scm b/guix/ui.scm index 4c31246920..1e089753e1 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -427,11 +427,6 @@ report them in a user-friendly way." (lambda _ (setlocale LC_ALL "")) (lambda args - (cond-expand - ;; Guile 2.2 already emits a warning, so let's not add a second one. - (guile-2.2 #t) - (else (warning (G_ "failed to install locale: ~a~%") - (strerror (system-error-errno args))))) (display-hint (G_ "Consider installing the @code{glibc-utf8-locales} or @code{glibc-locales} package and defining @code{GUIX_LOCPATH}, along these lines: @@ -459,8 +454,8 @@ See the \"Application Setup\" section in the manual, for more info.\n"))))) ;; notified via an EPIPE later. (sigaction SIGPIPE SIG_IGN) - (setvbuf (current-output-port) _IOLBF) - (setvbuf (current-error-port) _IOLBF)) + (setvbuf (current-output-port) 'line) + (setvbuf (current-error-port) 'line)) (define* (show-version-and-exit #:optional (command (car (command-line)))) "Display version information for COMMAND and `(exit 0)'." |