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

* Applied a patch from David Brown to prevent `nix-store --optimise'

Browse source 
from failing on rename() on BtrFS.
This commit is contained in:
Eelco Dolstra 2010-06-04 13:56:11 +00:00
parent 1ab67cf437
commit 07ca66cf24
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/libstore/optimise-store.cc
View file

@ -119,9 +119,23 @@ static void hashAndLink(bool dryRun, HashToPath & hashToPath,
} }
/* Atomically replace the old file with the new hard link. */ /* Atomically replace the old file with the new hard link. */
if (rename(tempLink.c_str(), path.c_str()) == -1) if (rename(tempLink.c_str(), path.c_str()) == -1) {
if (errno == EMLINK) {
/* Some filesystems generate too many links on the
rename, rather than on the original link.
(Probably it temporarily increases the st_nlink
field before decreasing it again.) */
printMsg(lvlInfo, format("`%1%' has maximum number of links") % prevPath.first);
hashToPath[hash] = std::pair<Path, ino_t>(path, st.st_ino);
/* Unlink the temp link. */
if (unlink(tempLink.c_str()) == -1)
printMsg(lvlError, format("unable to unlink `%1%'") % tempLink);
return;
}
throw SysError(format("cannot rename `%1%' to `%2%'") throw SysError(format("cannot rename `%1%' to `%2%'")
% tempLink % path); % tempLink % path);
}
} else } else
printMsg(lvlTalkative, format("would link `%1%' to `%2%'") % path % prevPath.first); printMsg(lvlTalkative, format("would link `%1%' to `%2%'") % path % prevPath.first);