consistent capitalization
This commit is contained in:
parent
bfca5fc395
commit
c79d4addab
|
@ -202,7 +202,7 @@ static int _main(int argc, char * * argv)
|
||||||
auto msg = chomp(drainFD(5, false));
|
auto msg = chomp(drainFD(5, false));
|
||||||
logError(
|
logError(
|
||||||
ErrorInfo {
|
ErrorInfo {
|
||||||
.name = "remote build",
|
.name = "Remote build",
|
||||||
.hint = hintfmt("cannot build on '%s': %s%s",
|
.hint = hintfmt("cannot build on '%s': %s%s",
|
||||||
bestMachine->storeUri, e.what(),
|
bestMachine->storeUri, e.what(),
|
||||||
(msg.empty() ? "" : ": " + msg))
|
(msg.empty() ? "" : ": " + msg))
|
||||||
|
|
|
@ -24,7 +24,7 @@ static void createLinks(State & state, const Path & srcDir, const Path & dstDir,
|
||||||
if (e.errNo == ENOTDIR) {
|
if (e.errNo == ENOTDIR) {
|
||||||
logWarning(
|
logWarning(
|
||||||
ErrorInfo {
|
ErrorInfo {
|
||||||
.name = "Create Links - Directory",
|
.name = "Create links - directory",
|
||||||
.hint = hintfmt("not including '%s' in the user environment because it's not a directory", srcDir)
|
.hint = hintfmt("not including '%s' in the user environment because it's not a directory", srcDir)
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
|
@ -47,7 +47,7 @@ static void createLinks(State & state, const Path & srcDir, const Path & dstDir,
|
||||||
if (e.errNo == ENOENT || e.errNo == ENOTDIR) {
|
if (e.errNo == ENOENT || e.errNo == ENOTDIR) {
|
||||||
logWarning(
|
logWarning(
|
||||||
ErrorInfo {
|
ErrorInfo {
|
||||||
.name = "Create Links - Skipping Symlink",
|
.name = "Create links - skipping symlink",
|
||||||
.hint = hintfmt("skipping dangling symlink '%s'", dstFile)
|
.hint = hintfmt("skipping dangling symlink '%s'", dstFile)
|
||||||
});
|
});
|
||||||
continue;
|
continue;
|
||||||
|
|
|
@ -601,7 +601,7 @@ struct curlFileTransfer : public FileTransfer
|
||||||
} catch (std::exception & e) {
|
} catch (std::exception & e) {
|
||||||
logError(
|
logError(
|
||||||
ErrorInfo {
|
ErrorInfo {
|
||||||
.name = "download",
|
.name = "File transfer",
|
||||||
.hint = hintfmt("unexpected error in download thread: %s",
|
.hint = hintfmt("unexpected error in download thread: %s",
|
||||||
e.what())
|
e.what())
|
||||||
});
|
});
|
||||||
|
|
|
@ -132,7 +132,7 @@ Path LocalFSStore::addPermRoot(const StorePath & storePath,
|
||||||
|
|
||||||
logWarning(
|
logWarning(
|
||||||
ErrorInfo {
|
ErrorInfo {
|
||||||
.name = "GC Root",
|
.name = "GC root",
|
||||||
.hint = hintfmt("warning: '%1%' is not in a directory where the garbage collector looks for roots; "
|
.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",
|
"therefore, '%2%' might be removed by the garbage collector",
|
||||||
gcRoot, printStorePath(storePath))
|
gcRoot, printStorePath(storePath))
|
||||||
|
|
|
@ -1244,7 +1244,7 @@ bool LocalStore::verifyStore(bool checkContents, RepairFlag repair)
|
||||||
if (hash != link.name) {
|
if (hash != link.name) {
|
||||||
logError(
|
logError(
|
||||||
ErrorInfo {
|
ErrorInfo {
|
||||||
.name = "Invalid Hash",
|
.name = "Invalid hash",
|
||||||
.hint = hintfmt(
|
.hint = hintfmt(
|
||||||
"link '%s' was modified! expected hash '%s', got '%s'",
|
"link '%s' was modified! expected hash '%s', got '%s'",
|
||||||
linkPath, link.name, hash)
|
linkPath, link.name, hash)
|
||||||
|
@ -1283,7 +1283,7 @@ bool LocalStore::verifyStore(bool checkContents, RepairFlag repair)
|
||||||
if (info->narHash != nullHash && info->narHash != current.first) {
|
if (info->narHash != nullHash && info->narHash != current.first) {
|
||||||
logError(
|
logError(
|
||||||
ErrorInfo {
|
ErrorInfo {
|
||||||
.name = "Invalid Hash - Path Modified",
|
.name = "Invalid hash - path modified",
|
||||||
.hint = hintfmt("path '%s' was modified! expected hash '%s', got '%s'",
|
.hint = hintfmt("path '%s' was modified! expected hash '%s', got '%s'",
|
||||||
printStorePath(i), info->narHash.to_string(), current.first.to_string())
|
printStorePath(i), info->narHash.to_string(), current.first.to_string())
|
||||||
});
|
});
|
||||||
|
|
|
@ -132,7 +132,7 @@ void LocalStore::optimisePath_(Activity * act, OptimiseStats & stats,
|
||||||
if (S_ISREG(st.st_mode) && (st.st_mode & S_IWUSR)) {
|
if (S_ISREG(st.st_mode) && (st.st_mode & S_IWUSR)) {
|
||||||
logWarning(
|
logWarning(
|
||||||
ErrorInfo {
|
ErrorInfo {
|
||||||
.name = "Suspicious File",
|
.name = "Suspicious file",
|
||||||
.hint = hintfmt("skipping suspicious writable file '%1%'", path)
|
.hint = hintfmt("skipping suspicious writable file '%1%'", path)
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
|
@ -200,7 +200,7 @@ void LocalStore::optimisePath_(Activity * act, OptimiseStats & stats,
|
||||||
if (st.st_size != stLink.st_size) {
|
if (st.st_size != stLink.st_size) {
|
||||||
logWarning(
|
logWarning(
|
||||||
ErrorInfo {
|
ErrorInfo {
|
||||||
.name = "Corrupted Link",
|
.name = "Corrupted link",
|
||||||
.hint = hintfmt("removing corrupted link '%1%'", linkPath)
|
.hint = hintfmt("removing corrupted link '%1%'", linkPath)
|
||||||
});
|
});
|
||||||
unlink(linkPath.c_str());
|
unlink(linkPath.c_str());
|
||||||
|
|
|
@ -205,7 +205,7 @@ void handleSQLiteBusy(SQLiteBusy & e)
|
||||||
if (now > lastWarned + 10) {
|
if (now > lastWarned + 10) {
|
||||||
lastWarned = now;
|
lastWarned = now;
|
||||||
logWarning(
|
logWarning(
|
||||||
ErrorInfo { .name = "sqlite busy",
|
ErrorInfo { .name = "Sqlite busy",
|
||||||
.hint = hintfmt(e.what())
|
.hint = hintfmt(e.what())
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue