summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-06-06 16:36:01 +0200
committerLudovic Courtès <ludo@gnu.org>2018-06-14 11:16:59 +0200
commit0d0438ed8cb744bffa8c7e0a8d60165ce604939f (patch)
treedbb814a67fcda8ff2bb5be6cbf9f85db5fb8071e
parent866ee8c66aad84fe64a20a14ff19d20a4a408e5b (diff)
downloadpatches-0d0438ed8cb744bffa8c7e0a8d60165ce604939f.tar
patches-0d0438ed8cb744bffa8c7e0a8d60165ce604939f.tar.gz
deduplicate: Fix a couple of thinkos.
* guix/store/deduplication.scm (get-temp-link): Turn 'args' in the 'catch' handler into a rest argument. (deduplicate): Use 'lstat' instead of 'file-is-directory?' to properly handle symlinks. When iterating over the result of 'scandir', exclude the ".links" sub-directory. * tests/store-deduplication.scm ("deduplicate"): Create sub-directories and call 'deduplicate' directly on STORE.
-rw-r--r--guix/store/deduplication.scm13
-rw-r--r--tests/store-deduplication.scm9
2 files changed, 12 insertions, 10 deletions
diff --git a/guix/store/deduplication.scm b/guix/store/deduplication.scm
index 4b4ac01f64..d3139eb904 100644
--- a/guix/store/deduplication.scm
+++ b/guix/store/deduplication.scm
@@ -85,7 +85,7 @@ LINK-PREFIX."
(lambda ()
(link target tempname)
tempname)
- (lambda (args)
+ (lambda args
(if (= (system-error-errno args) EEXIST)
(try (tempname-in link-prefix))
(throw 'system-error args))))))
@@ -120,12 +120,15 @@ under STORE."
(link-file (string-append links-directory "/"
(bytevector->base16-string hash))))
(mkdir-p links-directory)
- (if (file-is-directory? path)
+ (if (eq? 'directory (stat:type (lstat path)))
;; Can't hardlink directories, so hardlink their atoms.
(for-each (lambda (file)
- (unless (member file '("." ".."))
- (deduplicate file (nar-sha256 file)
- #:store store)))
+ (unless (or (member file '("." ".."))
+ (and (string=? path store)
+ (string=? file ".links")))
+ (let ((file (string-append path "/" file)))
+ (deduplicate file (nar-sha256 file)
+ #:store store))))
(scandir path))
(if (file-exists? link-file)
(false-if-system-error (EMLINK)
diff --git a/tests/store-deduplication.scm b/tests/store-deduplication.scm
index 04817a193a..2361723199 100644
--- a/tests/store-deduplication.scm
+++ b/tests/store-deduplication.scm
@@ -37,10 +37,12 @@
(lambda (store)
(let ((data (string->utf8 "Hello, world!"))
(identical (map (lambda (n)
- (string-append store "/" (number->string n)))
+ (string-append store "/" (number->string n)
+ "/a/b/c"))
(iota 5)))
(unique (string-append store "/unique")))
(for-each (lambda (file)
+ (mkdir-p (dirname file))
(call-with-output-file file
(lambda (port)
(put-bytevector port data))))
@@ -49,10 +51,7 @@
(lambda (port)
(put-bytevector port (string->utf8 "This is unique."))))
- (for-each (lambda (file)
- (deduplicate file (sha256 data) #:store store))
- identical)
- (deduplicate unique (nar-sha256 unique) #:store store)
+ (deduplicate store (nar-sha256 store) #:store store)
;; (system (string-append "ls -lRia " store))
(cons* (apply = (map (compose stat:ino stat) identical))