wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity

convert some errors

Browse source
This commit is contained in:
Ben Burdette 2020-05-01 14:32:06 -06:00
parent a3030e3c31
commit 4b99c09f5c
7 changed files with 86 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libstore/gc.cc
View file

@ -41,7 +41,8 @@ AutoCloseFD LocalStore::openGCLock(LockType lockType)
throw SysError("opening global GC lock '%1%'", fnGCLock);
if (!lockFile(fdGCLock.get(), lockType, false)) {
printError(format("waiting for the big garbage collector lock..."));
// TODO: info?
printError("waiting for the big garbage collector lock...");
lockFile(fdGCLock.get(), lockType, true);
}
@ -129,10 +130,14 @@ Path LocalFSStore::addPermRoot(const StorePath & storePath,
if (settings.checkRootReachability) {
auto roots = findRoots(false);
if (roots[storePath.clone()].count(gcRoot) == 0)
printError(
"warning: '%1%' is not in a directory where the garbage collector looks for roots; "
logWarning(
ErrorInfo {
.name = "GC Root",
.hint = hintfmt("warning: '%1%' is not in a directory where the garbage collector looks for roots; "
"therefore, '%2%' might be removed by the garbage collector",
gcRoot, printStorePath(storePath));
gcRoot, printStorePath(storePath))
});
}
/* Grab the global GC root, causing us to block while a GC is in