diff options
author | Ludovic Courtès <ludo@gnu.org> | 2015-05-01 15:03:30 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2015-05-01 15:03:30 +0200 |
commit | bf4af30bb2bce9dd5baf91f313ea35c55893eb10 (patch) | |
tree | 94aa42278cd88cb50304e7fe34854399fc5255af /guix/serialization.scm | |
parent | 9e63a388d91f73e2b82f8c4688f131680fe5f165 (diff) | |
parent | bc7d089a9cb5ce843730f863cc03195168a956b9 (diff) |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/serialization.scm')
-rw-r--r-- | guix/serialization.scm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/guix/serialization.scm b/guix/serialization.scm index a99f53ee0b..51d7ef76c6 100644 --- a/guix/serialization.scm +++ b/guix/serialization.scm @@ -140,10 +140,9 @@ substitute invalid byte sequences with question marks. This is a ;; not very efficient. Eventually Guile may provide a lightweight ;; permissive UTF-8 decoder. (let* ((bv (read-byte-string p)) - (port (with-fluids ((%default-port-encoding "UTF-8") - (%default-port-conversion-strategy - 'substitute)) - (open-bytevector-input-port bv)))) + (port (open-bytevector-input-port bv))) + (set-port-encoding! port "UTF-8") + (set-port-conversion-strategy! port 'substitute) (get-string-all port))) (define (write-string-list l p) |