guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: hydra: web: Correctly handle non-ASCII file names


From: Ludovic Courtès
Subject: branch master updated: hydra: web: Correctly handle non-ASCII file names.
Date: Wed, 20 Oct 2021 15:43:31 -0400

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
     new 5c5341d  hydra: web: Correctly handle non-ASCII file names.
5c5341d is described below

commit 5c5341d42d1aaea7747ac69e26466eb6a6936712
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Oct 20 21:41:52 2021 +0200

    hydra: web: Correctly handle non-ASCII file names.
    
    * hydra/modules/sysadmin/web.scm (build-program)[build]: Call 'setenv'
    and 'setlocale'.
---
 hydra/modules/sysadmin/web.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/hydra/modules/sysadmin/web.scm b/hydra/modules/sysadmin/web.scm
index 5bb183f..bc1f078 100644
--- a/hydra/modules/sysadmin/web.scm
+++ b/hydra/modules/sysadmin/web.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix system administration tools.
 ;;;
-;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
 ;;;
 ;;; This program is free software: you can redistribute it and/or modify
@@ -25,6 +25,7 @@
   #:use-module (guix git-download)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages guile-xyz)
@@ -87,6 +88,11 @@ that's built with Haunt or similar."
                      (string-append (%repository-cache-directory)
                                     "/" directory))))
 
+          ;; Properly handle UTF-8 file names in the repo.
+          (setenv "GUIX_LOCPATH"
+                  #+(file-append glibc-utf8-locales "/lib/locale"))
+          (setlocale LC_ALL "en_US.utf8")
+
           (define-values (checkout commit relation)
             (apply update-cached-checkout #$url #:ref '#$ref
                    (if cache



reply via email to

[Prev in Thread] Current Thread [Next in Thread]