diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-03-09 16:35:41 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-03-09 16:35:41 +0100 |
| commit | e90e0fad1b3ba79d81f02424e143ee6f4f736e8b (patch) | |
| tree | 2c26190fd9114199b0ef79303e18a61100cab4af /guix/utils.scm | |
| parent | 8ea0700d231a8819fc7e8332e9685f0ce15c174e (diff) | |
| parent | 9ec2a4d3fec44f08a55df9f5f3d1a04b83e7fcf6 (diff) | |
| download | gnu-guix-e90e0fad1b3ba79d81f02424e143ee6f4f736e8b.tar gnu-guix-e90e0fad1b3ba79d81f02424e143ee6f4f736e8b.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/utils.scm')
| -rw-r--r-- | guix/utils.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/utils.scm b/guix/utils.scm index 72dc0687a4..b72e3f233f 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -43,7 +43,7 @@ #:use-module (ice-9 regex) #:use-module (ice-9 match) #:use-module (ice-9 format) - #:use-module ((ice-9 iconv) #:select (bytevector->string)) + #:use-module ((ice-9 iconv) #:prefix iconv:) #:use-module (system foreign) #:re-export (memoize) ; for backwards compatibility #:export (bytevector->base16-string @@ -326,7 +326,7 @@ This procedure returns #t on success." (seek in 0 SEEK_SET) ; read from the beginning of the file. (let* ((pre-bv (get-bytevector-n in start)) ;; The expression in string form. - (str (bytevector->string + (str (iconv:bytevector->string (get-bytevector-n in (- end start)) (port-encoding in))) (post-bv (get-bytevector-all in)) |