From 15cf28fbb4672b05a0a0f430dc496c7eada18794 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 14 Dec 2020 15:11:51 +0100 Subject: daemon: Do not reset timestamps and permissions on substituted items. 'guix substitute' now takes care of it via 'restore-file'. * nix/libstore/build.cc (SubstitutionGoal::finished): Remove call to 'canonicalisePathMetaData'. --- nix/libstore/build.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nix') diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc index b19471a68f..ea809c6971 100644 --- a/nix/libstore/build.cc +++ b/nix/libstore/build.cc @@ -3085,7 +3085,8 @@ void SubstitutionGoal::finished() if (repair) replaceValidPath(storePath, destPath); - canonicalisePathMetaData(storePath, -1); + /* Note: 'guix substitute' takes care of resetting timestamps and + permissions on 'destPath', so no need to do it here. */ worker.store.optimisePath(storePath); // FIXME: combine with hashPath() -- cgit 1.4.1