[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/07: daemon: Do not reset timestamps and permissions on substituted it
|
From: |
guix-commits |
|
Subject: |
04/07: daemon: Do not reset timestamps and permissions on substituted items. |
|
Date: |
Sat, 19 Dec 2020 17:28:33 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 15cf28fbb4672b05a0a0f430dc496c7eada18794
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Dec 14 15:11:51 2020 +0100
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(-)
diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index b19471a..ea809c6 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()
- branch master updated (f6f6e1e -> 4f621a2), guix-commits, 2020/12/19
- 01/07: tests: Check the build trace for hash mismatches on substitutes., guix-commits, 2020/12/19
- 03/07: tests: Check the mtime and permissions of substituted items., guix-commits, 2020/12/19
- 02/07: daemon: Let 'guix substitute' perform hash checks., guix-commits, 2020/12/19
- 05/07: tests: Make sure substituted items are deduplicated., guix-commits, 2020/12/19
- 06/07: daemon: Delegate deduplication to 'guix substitute'., guix-commits, 2020/12/19
- 07/07: maint: Require Guile >= 2.2.6., guix-commits, 2020/12/19
- 04/07: daemon: Do not reset timestamps and permissions on substituted items.,
guix-commits <=