nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 03:56:01 +01:00
Code Activity

Delete scratch data for CA derivation that produced already-extant output

Browse source 
In the case where the store object doesn't exist, we do correctly move
(rather than copy) the scratch data into place. In this case, the
destination store object already exists, but we still want to clean up
after ourselves.
This commit is contained in:
John Ericson 2025-09-26 00:22:54 -04:00
parent 3bf1268ac6
commit 3c610df550
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/unix/build/derivation-builder.cc
View file

@ -1712,6 +1712,8 @@ SingleDrvOutputs DerivationBuilderImpl::registerOutputs()
/* Path already exists because CA path produced by something /* Path already exists because CA path produced by something
else. No moving needed. */ else. No moving needed. */
assert(newInfo.ca); assert(newInfo.ca);
/* Can delete our scratch copy now. */
deletePath(actualPath);
} else { } else {
auto destPath = store.toRealPath(finalDestPath); auto destPath = store.toRealPath(finalDestPath);
deletePath(destPath); deletePath(destPath);