diff mbox series

[bug#45253,4/6] daemon: Do not reset timestamps and permissions on substituted items.

Message ID 20201215095730.10954-4-ludo@gnu.org
State Accepted
Headers show
Series Pipeline substitute integrity check, deduplication, and canonicalization | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue

Commit Message

Ludovic Courtès Dec. 15, 2020, 9:57 a.m. UTC 
'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(-)
diff mbox series

Patch

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