04/10: gnu: installer: Fix issue with "Esperanto" locale.

[guix-commits]

civodul pushed a commit to branch version-1.1.0
in repository guix.

commit 0bd7a6bad9af06e1149e7019a3102edbbeac6b76
Author: Mathieu Othacehe <address@hidden>
AuthorDate: Fri Apr 10 15:44:38 2020 +0200

    gnu: installer: Fix issue with "Esperanto" locale.
    
    According to glibc manual, locale are under the following form:
              language[_territory[.codeset]][@modifier]
    
    The esperanto locale "epo" does not have a territory. Modify run-command to
    take this into account.
    
    Reported by Alex Sassmannshausen here:
    https://lists.gnu.org/archive/html/guix-devel/2020-04/msg00192.html.
    
    * gnu/installer/utils.scm (run-command): Handle locale without territory 
such
    as "epo".
---
 gnu/installer/utils.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/installer/utils.scm b/gnu/installer/utils.scm
index 0a91ae1..5f8fe8c 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 <address@hidden>
+;;; Copyright © 2018, 2020 Mathieu Othacehe <address@hidden>
 ;;; Copyright © 2019, 2020 Ludovic Courtès <address@hidden>
 ;;;
 ;;; 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)