01/08: gnu: gettext: Set encoding to ISO-8859-1 when modifying files.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit e8c9f0498f9f3ead4ea345d49f1c5e630ff158f8
Author: Ludovic Courtès <address@hidden>
Date:   Fri Feb 27 14:37:03 2015 +0100

    gnu: gettext: Set encoding to ISO-8859-1 when modifying files.
    
    * gnu/packages/gettext.scm (gnu-gettext)[arguments] <patch-tests>: Set
      %default-port-encoding.  Fixes test failures at
      <http://hydra.gnu.org/build/262586>.
---
 gnu/packages/gettext.scm |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index af8876f..27b5fb5 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -51,21 +51,25 @@
                  'check 'patch-tests
                  (lambda* (#:key inputs #:allow-other-keys)
                    (let* ((bash (which "sh")))
-                     (substitute*
-                         (find-files "gettext-tools/tests"
-                                     "^(lang-sh|msg(exec|filter)-[0-9])")
-                       (("#![[:blank:]]/bin/sh")
-                        (format #f "#!~a" bash)))
+                     ;; Some of the files we're patching are
+                     ;; ISO-8859-1-encoded, so choose it as the default
+                     ;; encoding so the byte encoding is preserved.
+                     (with-fluids ((%default-port-encoding #f))
+                       (substitute*
+                           (find-files "gettext-tools/tests"
+                                       "^(lang-sh|msg(exec|filter)-[0-9])")
+                         (("#![[:blank:]]/bin/sh")
+                          (format #f "#!~a" bash)))
 
-                     (substitute* (cons "gettext-tools/src/msginit.c"
-                                        (find-files 
"gettext-tools/gnulib-tests"
-                                                    "posix_spawn"))
-                       (("/bin/sh")
-                        bash))
+                       (substitute* (cons "gettext-tools/src/msginit.c"
+                                          (find-files 
"gettext-tools/gnulib-tests"
+                                                      "posix_spawn"))
+                         (("/bin/sh")
+                          bash))
 
-                     (substitute* "gettext-tools/src/project-id"
-                       (("/bin/pwd")
-                        "pwd"))))
+                       (substitute* "gettext-tools/src/project-id"
+                         (("/bin/pwd")
+                          "pwd")))))
                  %standard-phases)
 
        ;; When tests fail, we want to know the details.