From 14c422c12c86126cfb5ca7e1641bbcd78d02f711 Mon Sep 17 00:00:00 2001 From: Caleb Ristvedt Date: Sat, 8 Aug 2020 10:05:22 -0500 Subject: deduplication: pass store directory to replace-with-link. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This causes with-writable-file to take into consideration the actual store being used, as passed to 'deduplicate', rather than whatever (%store-directory) may return. * guix/store/deduplication.scm (replace-with-link): new keyword argument 'store'. Pass to with-writable-file. (with-writable-file, call-with-writable-file): new store argument. (deduplicate): pass store to replace-with-link. Signed-off-by: Ludovic Courtès --- .dir-locals.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.dir-locals.el') diff --git a/.dir-locals.el b/.dir-locals.el index 5954e313f2..7f310d2612 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -37,7 +37,7 @@ (eval . (put 'with-file-lock 'scheme-indent-function 1)) (eval . (put 'with-file-lock/no-wait 'scheme-indent-function 1)) (eval . (put 'with-profile-lock 'scheme-indent-function 1)) - (eval . (put 'with-writable-file 'scheme-indent-function 1)) + (eval . (put 'with-writable-file 'scheme-indent-function 2)) (eval . (put 'package 'scheme-indent-function 0)) (eval . (put 'package/inherit 'scheme-indent-function 1)) -- cgit 1.4.1