TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

store: 'export-paths' doesn't export references of the given files. 

This fixes a regression introduced in
99fbddf9a6 ("store: Change 'export-paths'
to always export in topological order.")

* guix/store.scm (export-paths): Define 'ordered' variable.  Iterate
  over it.
* tests/store.scm ("export/import paths, ensure topological order"): Add
  'file0'.  Adjust accordingly.
This commit is contained in:
Ludovic Courtès 2014-03-07 00:18:28 +01:00
parent 4d01bd3c1c
commit cafb92d853
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
guix/store.scm
View File

@ -734,8 +734,13 @@ is raised if the set of paths read from PORT is not signed (as per
(define* (export-paths server paths port #:key (sign? #t)) (define* (export-paths server paths port #:key (sign? #t))
"Export the store paths listed in PATHS to PORT, in topological order, "Export the store paths listed in PATHS to PORT, in topological order,
signing them if SIGN? is true." signing them if SIGN? is true."
(define ordered
;; Sort PATHS, but don't include their references.
(filter (cut member <> paths)
(topologically-sorted server paths)))
(let ((s (nix-server-socket server))) (let ((s (nix-server-socket server)))
(let loop ((paths (topologically-sorted server paths))) (let loop ((paths ordered))
(match paths (match paths
(() (()
(write-int 0 port)) (write-int 0 port))

7
tests/store.scm
View File

@ -399,7 +399,9 @@ Deriver: ~a~%"
files))))))) files)))))))
(test-assert "export/import paths, ensure topological order" (test-assert "export/import paths, ensure topological order"
(let* ((file1 (add-text-to-store %store "foo" (random-text))) (let* ((file0 (add-text-to-store %store "baz" (random-text)))
(file1 (add-text-to-store %store "foo" (random-text)
(list file0)))
(file2 (add-text-to-store %store "bar" (random-text) (file2 (add-text-to-store %store "bar" (random-text)
(list file1))) (list file1)))
(files (list file1 file2)) (files (list file1 file2))
@ -412,9 +414,10 @@ Deriver: ~a~%"
(bytevector=? dump1 dump2) (bytevector=? dump1 dump2)
(let* ((source (open-bytevector-input-port dump1)) (let* ((source (open-bytevector-input-port dump1))
(imported (import-paths %store source))) (imported (import-paths %store source)))
;; DUMP1 should contain exactly FILE1 and FILE2, not FILE0.
(and (equal? imported (list file1 file2)) (and (equal? imported (list file1 file2))
(every file-exists? files) (every file-exists? files)
(null? (references %store file1)) (equal? (list file0) (references %store file1))
(equal? (list file1) (references %store file2))))))) (equal? (list file1) (references %store file2)))))))
(test-assert "import corrupt path" (test-assert "import corrupt path"