eisfunke/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Fix exception

Browse source
This commit is contained in:
Eelco Dolstra 2020-09-23 20:21:08 +02:00
parent 236d9ee7f7
commit 9a24ece122
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libstore/build.cc
View file

@ -1675,7 +1675,7 @@ void DerivationGoal::tryLocalBuild() {
} }
void replaceValidPath(const Path & storePath, const Path tmpPath) void replaceValidPath(const Path & storePath, const Path & tmpPath)
{ {
/* We can't atomically replace storePath (the original) with /* We can't atomically replace storePath (the original) with
tmpPath (the replacement), so we have to move it out of the tmpPath (the replacement), so we have to move it out of the
@ -1685,8 +1685,9 @@ void replaceValidPath(const Path & storePath, const Path tmpPath)
if (pathExists(storePath)) if (pathExists(storePath))
rename(storePath.c_str(), oldPath.c_str()); rename(storePath.c_str(), oldPath.c_str());
if (rename(tmpPath.c_str(), storePath.c_str()) == -1) { if (rename(tmpPath.c_str(), storePath.c_str()) == -1) {
auto ex = SysError("moving '%s' to '%s'", tmpPath, storePath);
rename(oldPath.c_str(), storePath.c_str()); // attempt to recover rename(oldPath.c_str(), storePath.c_str()); // attempt to recover
throw SysError("moving '%s' to '%s'", tmpPath, storePath); throw ex;
} }
deletePath(oldPath); deletePath(oldPath);
} }