Browse Source

Fix `imported-files' for files with a common prefix.

* guix/derivations.scm (imported-files)[builder]: For TAIL, check
  whether it exists before (mkdir TAIL).

* tests/derivations.scm ("imported-files"): Add file with a common
  prefix.
wip-grafts
Ludovic Courtès 10 years ago
parent
commit
224f7ad6a3
  1. 3
      guix/derivations.scm
  2. 3
      tests/derivations.scm

3
guix/derivations.scm

@ -412,7 +412,8 @@ system, imported, and appears under FINAL-PATH in the resulting store path."
`(false-if-exception
(mkdir ,d)))
head)
`((mkdir ,tail)))))
`((or (file-exists? ,tail)
(mkdir ,tail))))))
`((symlink ,store-path ,final-path)))))
files))))
(build-expression->derivation store name (%current-system)

3
tests/derivations.scm

@ -221,7 +221,8 @@
(let* ((files `(("x" . ,(search-path %load-path "ice-9/q.scm"))
("a/b/c" . ,(search-path %load-path
"guix/derivations.scm"))
("p/q" . ,(search-path %load-path "guix.scm"))))
("p/q" . ,(search-path %load-path "guix.scm"))
("p/z" . ,(search-path %load-path "guix/store.scm"))))
(drv-path (imported-files %store files)))
(and (build-derivations %store (list drv-path))
(let ((dir (derivation-path->output-path drv-path)))

Loading…
Cancel
Save