aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Burdette <bburdette@gmail.com>2020-05-13 10:02:18 -0600
committerBen Burdette <bburdette@gmail.com>2020-05-13 10:02:18 -0600
commitc79d4addab7ea476f551bc8727e4d1f27adcef31 (patch)
treeace9cce47341e481f7f4502cc83bfc20054dda49
parentbfca5fc395bdaf5823413e1a1679f1b0b6db29dd (diff)
consistent capitalization
-rw-r--r--src/build-remote/build-remote.cc2
-rw-r--r--src/libstore/builtins/buildenv.cc4
-rw-r--r--src/libstore/filetransfer.cc2
-rw-r--r--src/libstore/gc.cc2
-rw-r--r--src/libstore/local-store.cc4
-rw-r--r--src/libstore/optimise-store.cc4
-rw-r--r--src/libstore/sqlite.cc2
7 files changed, 10 insertions, 10 deletions
diff --git a/src/build-remote/build-remote.cc b/src/build-remote/build-remote.cc
index 0d6859596..0caa97fa4 100644
--- a/src/build-remote/build-remote.cc
+++ b/src/build-remote/build-remote.cc
@@ -202,7 +202,7 @@ static int _main(int argc, char * * argv)
auto msg = chomp(drainFD(5, false));
logError(
ErrorInfo {
- .name = "remote build",
+ .name = "Remote build",
.hint = hintfmt("cannot build on '%s': %s%s",
bestMachine->storeUri, e.what(),
(msg.empty() ? "" : ": " + msg))
diff --git a/src/libstore/builtins/buildenv.cc b/src/libstore/builtins/buildenv.cc
index 64085fcc9..6c493ed77 100644
--- a/src/libstore/builtins/buildenv.cc
+++ b/src/libstore/builtins/buildenv.cc
@@ -24,7 +24,7 @@ static void createLinks(State & state, const Path & srcDir, const Path & dstDir,
if (e.errNo == ENOTDIR) {
logWarning(
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)
});
return;
@@ -47,7 +47,7 @@ static void createLinks(State & state, const Path & srcDir, const Path & dstDir,
if (e.errNo == ENOENT || e.errNo == ENOTDIR) {
logWarning(
ErrorInfo {
- .name = "Create Links - Skipping Symlink",
+ .name = "Create links - skipping symlink",
.hint = hintfmt("skipping dangling symlink '%s'", dstFile)
});
continue;
diff --git a/src/libstore/filetransfer.cc b/src/libstore/filetransfer.cc
index 3285edded..89588d662 100644
--- a/src/libstore/filetransfer.cc
+++ b/src/libstore/filetransfer.cc
@@ -601,7 +601,7 @@ struct curlFileTransfer : public FileTransfer
} catch (std::exception & e) {
logError(
ErrorInfo {
- .name = "download",
+ .name = "File transfer",
.hint = hintfmt("unexpected error in download thread: %s",
e.what())
});
diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc
index e529416b7..d53d458e9 100644
--- a/src/libstore/gc.cc
+++ b/src/libstore/gc.cc
@@ -132,7 +132,7 @@ Path LocalFSStore::addPermRoot(const StorePath & storePath,
logWarning(
ErrorInfo {
- .name = "GC Root",
+ .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))
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 59d551032..194eefc78 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -1244,7 +1244,7 @@ bool LocalStore::verifyStore(bool checkContents, RepairFlag repair)
if (hash != link.name) {
logError(
ErrorInfo {
- .name = "Invalid Hash",
+ .name = "Invalid hash",
.hint = hintfmt(
"link '%s' was modified! expected hash '%s', got '%s'",
linkPath, link.name, hash)
@@ -1283,7 +1283,7 @@ bool LocalStore::verifyStore(bool checkContents, RepairFlag repair)
if (info->narHash != nullHash && info->narHash != current.first) {
logError(
ErrorInfo {
- .name = "Invalid Hash - Path Modified",
+ .name = "Invalid hash - path modified",
.hint = hintfmt("path '%s' was modified! expected hash '%s', got '%s'",
printStorePath(i), info->narHash.to_string(), current.first.to_string())
});
diff --git a/src/libstore/optimise-store.cc b/src/libstore/optimise-store.cc
index 9f6112183..c9ecca5a8 100644
--- a/src/libstore/optimise-store.cc
+++ b/src/libstore/optimise-store.cc
@@ -132,7 +132,7 @@ void LocalStore::optimisePath_(Activity * act, OptimiseStats & stats,
if (S_ISREG(st.st_mode) && (st.st_mode & S_IWUSR)) {
logWarning(
ErrorInfo {
- .name = "Suspicious File",
+ .name = "Suspicious file",
.hint = hintfmt("skipping suspicious writable file '%1%'", path)
});
return;
@@ -200,7 +200,7 @@ void LocalStore::optimisePath_(Activity * act, OptimiseStats & stats,
if (st.st_size != stLink.st_size) {
logWarning(
ErrorInfo {
- .name = "Corrupted Link",
+ .name = "Corrupted link",
.hint = hintfmt("removing corrupted link '%1%'", linkPath)
});
unlink(linkPath.c_str());
diff --git a/src/libstore/sqlite.cc b/src/libstore/sqlite.cc
index 082c54005..34ef5e57b 100644
--- a/src/libstore/sqlite.cc
+++ b/src/libstore/sqlite.cc
@@ -205,7 +205,7 @@ void handleSQLiteBusy(SQLiteBusy & e)
if (now > lastWarned + 10) {
lastWarned = now;
logWarning(
- ErrorInfo { .name = "sqlite busy",
+ ErrorInfo { .name = "Sqlite busy",
.hint = hintfmt(e.what())
});
}