#75007 - [PATCH] guile-launcher: Avoid the “C” locale and try “C.UTF-8”.

Package	Source(s)		Maintainer(s)
guix-patches		PTS Buildd Popcon

Message #5 received at submit@debbugs.gnu.org (full text, mbox, reply):

Received: (at submit) by debbugs.gnu.org; 21 Dec 2024 10:44:43 +0000
From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 21 05:44:43 2024
Received: from localhost ([127.0.0.1]:45424 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1tOwyQ-0002Pa-V0
	for submit@debbugs.gnu.org; Sat, 21 Dec 2024 05:44:43 -0500
Received: from lists.gnu.org ([209.51.188.17]:46084)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <ludo@gnu.org>) id 1tOwyP-0002PQ-5L
 for submit@debbugs.gnu.org; Sat, 21 Dec 2024 05:44:41 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <ludo@gnu.org>) id 1tOwyO-0000p9-Vd
 for guix-patches@gnu.org; Sat, 21 Dec 2024 05:44:40 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <ludo@gnu.org>)
 id 1tOwyO-0003GV-0h; Sat, 21 Dec 2024 05:44:40 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to:
 references; bh=oGJ0qX28SCx8PvvY3IRdmYyzZKHUbfx49X1c9ZCkSBQ=; b=Uc69dQOZXIl9bd
 K+HOktfnJxkq3Yp7JGgWjB6ZF5E+B2W14FIUG+GQPgFHqqz29qS9UAGF0peCk6tVCDXEi/Vo+dLdS
 f74gRaxXZ5oBt93P7Ebemyr0FathQ5WwaZe4eKjqKWMt6NTiRWcHhF0/qOkvXGVclGG1Ib09gVvgV
 7m/CKkqY3EoDqfqxVZuKTrFoZ2Sy70JsWw+VcFhF6kRCpXeSWu6gJnGECRe+9VFAIqmk0nBHDNtTP
 aTFIjQ7LBVy90PSxoju1E7ZTxCLK0lQBwmy6VSsjQ0dZXL7PhRmQghMdFbiNIhK97oGSgzK0uqxZ6
 tJYYhMY7efw7QNwTjOZQ==;
From: Ludovic Courtès <ludo@gnu.org>
To: guix-patches@gnu.org
Subject: [PATCH] guile-launcher: Avoid the “C” locale and try “C.UTF-8”.
Date: Sat, 21 Dec 2024 11:44:27 +0100
Message-ID: <24813952576725c0d7f6478543eec8e2747d525d.1734777730.git.ludo@gnu.org>
X-Mailer: git-send-email 2.46.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Debbugs-Cc: Christopher Baines <guix@cbaines.net>, Josselin Poiret <dev@jpoiret.xyz>, Ludovic CourtÃ¨s <ludo@gnu.org>, Mathieu Othacehe <othacehe@gnu.org>, Simon Tournier <zimon.toutoune@gmail.com>, Tobias Geerinckx-Rice <me@tobias.gr>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: submit
Cc: Ludovic Courtès <ludo@gnu.org>
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request@debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit@debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request@debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request@debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

This is a followup to ed0cd12a82b429bc5058f693a0f75f2ba0ee47c4, which
adds the C.UTF-8 locale to the glibc package, and
ee4e79f871bc2f848ce4b4a176bb725ab71e3cd6, which changed the default to
“C.UTF-8” for ‘guix’ commands.

Fixes a bug whereby starting ‘guix’ in an environment where the LC_*
variables are unset would start it in the “C” locale:

  echo '(pk (setlocale LC_ALL))' | guix shell -CW coreutils -- guix repl

This would lead to breakage for commands such as ‘guix substitute’ that
need to run in a UTF-8 locale.

* gnu/packages/aux-files/guile-launcher.c (main): Try “C.UTF-8” before
“en_US.UTF-8”.  Do that also when the current locale is “C”.
* guix/ui.scm (install-locale): Likewise.

Change-Id: I36da4db8f898f1083b33760e1ab46c3a257de811
---
 gnu/packages/aux-files/guile-launcher.c | 16 +++++++++++-----
 guix/ui.scm                             |  4 +++-
 2 files changed, 14 insertions(+), 6 deletions(-)

Hi!

Until now, ‘guix’ wouldn’t mind running in the C locale, but that’s not
good for ‘guix substitute’ and other commands started by ‘guix-daemon’.

This is something colleagues and I noticed while running ‘guix-daemon’
in a GitLab-CI container where LC_* were unset.

Thoughts?

Ludo’.

diff --git a/gnu/packages/aux-files/guile-launcher.c b/gnu/packages/aux-files/guile-launcher.c
index c205477f64..44f7e1f432 100644
--- a/gnu/packages/aux-files/guile-launcher.c
+++ b/gnu/packages/aux-files/guile-launcher.c
@@ -84,11 +84,17 @@ int
 main (int argc, char **argv)
 {
   /* Try to install the current locale; remain silent if it fails.  */
-  if (setlocale (LC_ALL, "") == NULL)
-    /* The 'guix pull'-provided 'guix' includes at least en_US.utf8 so use
-       that.  That gives us UTF-8 support for 'scm_to_locale_string', etc.,
-       which is always preferable over the C locale.  */
-    setlocale (LC_ALL, "en_US.utf8");
+  char *locale = setlocale (LC_ALL, "");
+  if (locale == NULL || strcmp (locale, "C") == 0)
+    {
+      /* The 'guix pull'-provided 'guix' includes at least C.UTF-8 (which is
+	 baked into glibc, except when cross-compiling) so use that, and fall
+	 back to en_US.UTF-8.  That gives us UTF-8 support for
+	 'scm_to_locale_string', etc., which is always preferable over the C
+	 locale.  */
+      if (setlocale (LC_ALL, "C.UTF-8") == NULL)
+	setlocale (LC_ALL, "en_US.utf8");
+    }
 
   const char *str;
   str = getenv ("GUILE_LOAD_PATH");
diff --git a/guix/ui.scm b/guix/ui.scm
index eba12c8616..14d6874795 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -521,7 +521,9 @@ (define (install-locale)
   "Install the current locale settings."
   (catch 'system-error
     (lambda _
-      (setlocale LC_ALL ""))
+      (when (string=? (setlocale LC_ALL "") "C")
+        ;; If the current locale is "C", prefer "C.UTF-8".
+        (setlocale LC_ALL "C.UTF-8")))
     (lambda args
       (display-hint (G_ "Consider installing the @code{glibc-locales} package
 and defining @code{GUIX_LOCPATH}, along these lines:

base-commit: 777fde8299d5b0050cae661d403374a7dd87f6ab
-- 
2.46.0

Display info messages

Send a report that this bug log contains spam.

debbugs.gnu.org maintainers <help-debbugs@gnu.org>. Last modified: Sun Dec 22 10:20:10 2024; Machine Name: wallace-server

GNU bug tracking system

Debbugs is free software and licensed under the terms of the GNU Public License version 2. The current version can be obtained from https://bugs.debian.org/debbugs-source/.

#75007 [PATCH] guile-launcher: Avoid the “C” locale and try “C.UTF-8”.