[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: maint: Run ‘etc/upgrade-manifest.scm’ in a UTF-8 locale.
From: |
guix-commits |
Subject: |
01/03: maint: Run ‘etc/upgrade-manifest.scm’ in a UTF-8 locale. |
Date: |
Mon, 2 Dec 2024 06:16:43 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit fb4100293545b30a7eef0b7f3b9bab024d0984a6
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Dec 2 11:52:31 2024 +0100
maint: Run ‘etc/upgrade-manifest.scm’ in a UTF-8 locale.
* etc/upgrade-manifest.scm: Add calls to ‘setlocale’ to force a UTF-8
locale.
Change-Id: Ia567a1e08124d9eab7fb32f3363681a8f37431b1
---
etc/upgrade-manifest.scm | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/etc/upgrade-manifest.scm b/etc/upgrade-manifest.scm
index 5e6d7d85e4..9c97d2b4e5 100644
--- a/etc/upgrade-manifest.scm
+++ b/etc/upgrade-manifest.scm
@@ -124,5 +124,14 @@
(name (string-append (package-name package) "-full-upgrade"))))
(dependents store security-packages 2))))))
+;; Install a UTF-8 locale so that file names in Git checkouts are interpreted
+;; as UTF-8 (the libgit2 source tree contains non-ASCII file names, for
+;; instance). XXX: This works around the fact that 'cuirass register' and
+;; thus 'cuirass evaluate' may not be running with a UTF-8 locale.
+(unless (string-suffix? ".UTF-8" (setlocale LC_ALL))
+ (or (false-if-exception (setlocale LC_ALL "C.UTF-8"))
+ (false-if-exception (setlocale LC_ALL "en_US.UTF-8"))
+ (format (current-error-port) "warning: failed to install UTF-8
locale~%")))
+
(concatenate-manifests
(list individual-security-upgrades joint-security-upgrades))