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.
gn-latest-20200428
Ludovic Courtès 9 years ago
parent
commit
224f7ad6a3
2 changed files with 4 additions and 2 deletions
  1. +2
    -1
      guix/derivations.scm
  2. +2
    -1
      tests/derivations.scm

+ 2
- 1
guix/derivations.scm View File

@ -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)


+ 2
- 1
tests/derivations.scm View File

@ -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