From 5895f2444317ba74eeab21d517c703c3687165c0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 27 May 2014 22:01:51 +0200 Subject: store: Work around 'get-bytevector-n' bug that affects 'import-paths'. Fixes . * guix/store.scm (process-stderr) <%stderr-read>: Use 'get-bytevector-n!' instead of 'get-bytevector-n'. --- guix/store.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/guix/store.scm b/guix/store.scm index 0c99e623ec..8c774a6db2 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -397,11 +397,13 @@ (define %stderr-error #x63787470) ; "cxtp", error reporting #f) ((= k %stderr-read) ;; Read a byte stream from USER-PORT. + ;; Note: Avoid 'get-bytevector-n' to work around + ;; in Guile up to 2.0.11. (let* ((max-len (read-int p)) - (data (get-bytevector-n user-port max-len)) - (len (bytevector-length data))) + (data (make-bytevector max-len)) + (len (get-bytevector-n! user-port data 0 max-len))) (write-int len p) - (put-bytevector p data) + (put-bytevector p data 0 len) (write-padding len p) #f)) ((= k %stderr-next) -- cgit v1.2.3