[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#45253] [PATCH 4/6] daemon: Do not reset timestamps and permissions
From: |
Ludovic Courtès |
Subject: |
[bug#45253] [PATCH 4/6] daemon: Do not reset timestamps and permissions on substituted items. |
Date: |
Tue, 15 Dec 2020 10:57:28 +0100 |
'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 --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()
--
2.29.2
- [bug#45253] [PATCH 0/6] Pipeline substitute integrity check, deduplication, and canonicalization, Ludovic Courtès, 2020/12/15
- [bug#45253] [PATCH 1/6] tests: Check the build trace for hash mismatches on substitutes., Ludovic Courtès, 2020/12/15
- [bug#45253] [PATCH 0/6] Pipeline substitute integrity check, deduplication, and canonicalization, Ludovic Courtès, 2020/12/15
- bug#45253: [PATCH 0/6] Pipeline substitute integrity check, deduplication, and canonicalization, Ludovic Courtès, 2020/12/19