ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

store: Really disable file name canonicalization for derivation inputs.

Browse source 
* guix/store.scm (write-contents)[call-with-binary-input-file]: Set
  %FILE-PORT-NAME-CANONICALIZATION to #f.
* gnu/packages.scm (search-patch, search-bootstrap-binary): Leave
  %FILE-PORT-NAME-CANONICALIZATION unchanged.  This reverts 9776ebb.
This commit is contained in:
Ludovic Courtès 2013-03-22 22:58:19 +01:00
parent 238f739777
commit 128663e4c8
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gnu/packages.scm
View file

@ -61,14 +61,12 @@ (define %bootstrap-binaries-path
(define (search-patch file-name)
"Search the patch FILE-NAME."
(with-fluids ((%file-port-name-canonicalization #f))
(search-path (%patch-path) file-name)))
(search-path (%patch-path) file-name))
(define (search-bootstrap-binary file-name system)
"Search the bootstrap binary FILE-NAME for SYSTEM."
(with-fluids ((%file-port-name-canonicalization #f))
(search-path (%bootstrap-binaries-path)
(string-append system "/" file-name))))
(string-append system "/" file-name)))
(define %distro-module-directory
;; Absolute path of the (gnu packages ...) module root.

6
guix/store.scm
View file

@ -238,12 +238,14 @@ (define (write-contents file p size)
"Write SIZE bytes from FILE to output port P."
(define (call-with-binary-input-file file proc)
;; Open FILE as a binary file. This avoids scan-for-encoding, and thus
;; avoids any initial buffering.
;; avoids any initial buffering. Disable file name canonicalization to
;; avoid stat'ing like crazy.
(with-fluids ((%file-port-name-canonicalization #f))
(let ((port (open-file file "rb")))
(catch #t (cut proc port)
(lambda args
(close-port port)
(apply throw args)))))
(apply throw args))))))
(define (dump in size)
(define buf-size 65536)