diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-12-14 15:11:51 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-12-19 23:25:01 +0100 |
| commit | 15cf28fbb4672b05a0a0f430dc496c7eada18794 (patch) | |
| tree | efe0183835245889f1f3b44874eadd6c5cd898e6 /nix | |
| parent | 77a1efed9e12ce0e2c470d7b0601ae70c72b010b (diff) | |
| download | guix-15cf28fbb4672b05a0a0f430dc496c7eada18794.tar guix-15cf28fbb4672b05a0a0f430dc496c7eada18794.tar.gz | |
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'.
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/libstore/build.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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() |