guix-commits
[Top][All Lists]
Advanced

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

branch master updated: pack: Add UTF-8 locales to RPM pack builder.


From: guix-commits
Subject: branch master updated: pack: Add UTF-8 locales to RPM pack builder.
Date: Thu, 23 Feb 2023 06:31:07 -0500

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

apteryx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 5e7b0a7735 pack: Add UTF-8 locales to RPM pack builder.
5e7b0a7735 is described below

commit 5e7b0a7735d9956ee8b8c3763e4ce05e2855606f
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Feb 22 11:36:02 2023 -0500

    pack: Add UTF-8 locales to RPM pack builder.
    
    It's necessary as 'generate-header' call ends up calling 'find-files', which
    could fail to read file names containing non-ascii characters, as spotted in
    the wild:
    
       building /gnu/store/...-jami-rpm-pack.rpm.drv...
       find-files: 
./gnu/store/...-nss-certs-3.81/etc/ssl/certs/NetLock_Arany_=Class_Gold=_F??tan??s??tv??ny.pem:
       No such file or directory
    
    * guix/scripts/pack.scm (rpm-archive): Expand set-utf8-locale helper in the
    builder gexp.
---
 guix/scripts/pack.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index 701e41ff1a..51a7b8f185 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -945,6 +945,9 @@ PREUN-FILE and POSTUN-FILE can be provided via 
EXTRA-OPTIONS."
                          (rnrs bytevectors)
                          (srfi srfi-1))
 
+            ;; Make sure non-ASCII file names are properly handled.
+            #+(set-utf8-locale profile)
+
             (define machine-type
               (and=> (or #$target %host-type)
                      (lambda (triplet)



reply via email to

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