From 4db87162e68e58031d71597a86b253072e18e2ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 28 Feb 2015 01:10:24 +0100 Subject: [PATCH] packages: Set the port conversion strategy to 'error'. Suggested by Mark H Weaver. * guix/build/gnu-build-system.scm (gnu-build): Set %DEFAULT-PORT-CONVERSION-STRATEGY to 'error. * guix/packages.scm (patch-and-repack)[builder]: Likewise. --- guix/build/gnu-build-system.scm | 3 +++ guix/packages.scm | 3 +++ 2 files changed, 6 insertions(+) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index a2bd9d43d1..5ae537150f 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -499,6 +499,9 @@ in order. Return #t if all the PHASES succeeded, #f otherwise." (setvbuf (current-output-port) _IOLBF) (setvbuf (current-error-port) _IOLBF) + ;; Encoding/decoding errors shouldn't be silent. + (fluid-set! %default-port-conversion-strategy 'error) + ;; The trick is to #:allow-other-keys everywhere, so that each procedure in ;; PHASES can pick the keyword arguments it's interested in. (every (match-lambda diff --git a/guix/packages.scm b/guix/packages.scm index b72a6ddc8e..fc5264673d 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -412,6 +412,9 @@ IMPORTED-MODULES specify modules to use/import for use by SNIPPET." (srfi srfi-1) (guix build utils)) + ;; Encoding/decoding errors shouldn't be silent. + (fluid-set! %default-port-conversion-strategy 'error) + (let ((locales (assoc-ref %build-inputs "locales")) (out (assoc-ref %outputs "out")) (xz (assoc-ref %build-inputs "xz"))