diff options
| author | Jakub Kądziołka <kuba@kadziolka.net> | 2020-04-29 11:08:42 +0200 |
|---|---|---|
| committer | Jakub Kądziołka <kuba@kadziolka.net> | 2020-04-29 11:08:42 +0200 |
| commit | 4035c3e3525599c3aa958d498c5bc789a4adffc3 (patch) | |
| tree | e55a02215fcdb635d0504fc129526bfbf66abd14 /gnu/installer/utils.scm | |
| parent | 492b82bd4d592276e65c4b9bfbe1b679a00ff09f (diff) | |
| parent | 4f0f46e4af0e342d84c5ad448258702029601e4b (diff) | |
| download | guix-4035c3e3525599c3aa958d498c5bc789a4adffc3.tar guix-4035c3e3525599c3aa958d498c5bc789a4adffc3.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/installer/utils.scm')
| -rw-r--r-- | gnu/installer/utils.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/installer/utils.scm b/gnu/installer/utils.scm index 0a91ae1e4a..5f8fe8ca01 100644 --- a/gnu/installer/utils.scm +++ b/gnu/installer/utils.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> +;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. @@ -93,7 +93,8 @@ COMMAND exited successfully, #f otherwise." (setenv "LC_ALL" locale) (setenv "LANGUAGE" (string-take locale - (string-index locale #\_)))))) + (or (string-index locale #\_) + (string-length locale))))))) (guard (c ((invoke-error? c) (newline) |