aboutsummaryrefslogtreecommitdiff
path: root/src/libstore
diff options
context:
space:
mode:
authorBen Burdette <bburdette@gmail.com>2020-05-11 13:02:16 -0600
committerBen Burdette <bburdette@gmail.com>2020-05-11 13:02:16 -0600
commit958e81987b5b86fba06090078a556f51037aa23c (patch)
tree1a311fc50f08ed5fc45ffc176c6ae25bc0e676d7 /src/libstore
parent55eb71714854b262b5e1079ff250a13cc0bbf644 (diff)
switch from printError warnings to logWarnings
Diffstat (limited to 'src/libstore')
-rw-r--r--src/libstore/build.cc14
-rw-r--r--src/libstore/store-api.cc6
2 files changed, 16 insertions, 4 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index f8cc1ce36..a7d6e53b0 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -3647,7 +3647,11 @@ void DerivationGoal::registerOutputs()
/* Apply hash rewriting if necessary. */
bool rewritten = false;
if (!outputRewrites.empty()) {
- printError("warning: rewriting hashes in '%1%'; cross fingers", path);
+ logWarning(
+ ErrorInfo {
+ .name = "Rewriting hashes",
+ .hint = hintfmt("rewriting hashes in '%1%'; cross fingers", path)
+ });
/* Canonicalise first. This ensures that the path we're
rewriting doesn't contain a hard link to /etc/shadow or
@@ -4414,8 +4418,12 @@ void SubstitutionGoal::tryNext()
&& !sub->isTrusted
&& !info->checkSignatures(worker.store, worker.store.getPublicKeys()))
{
- printError("warning: substituter '%s' does not have a valid signature for path '%s'",
- sub->getUri(), worker.store.printStorePath(storePath));
+ logWarning(
+ ErrorInfo {
+ .name = "Invalid path signature",
+ .hint = hintfmt("substituter '%s' does not have a valid signature for path '%s'",
+ sub->getUri(), worker.store.printStorePath(storePath))
+ });
tryNext();
return;
}
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index 542e5c552..d1281d130 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -769,7 +769,11 @@ void ValidPathInfo::sign(const Store & store, const SecretKey & secretKey)
bool ValidPathInfo::isContentAddressed(const Store & store) const
{
auto warn = [&]() {
- printError("warning: path '%s' claims to be content-addressed but isn't", store.printStorePath(path));
+ logWarning(
+ ErrorInfo{
+ .name = "Path not content-addressed",
+ .hint = hintfmt("path '%s' claims to be content-addressed but isn't", store.printStorePath(path))
+ });
};
if (hasPrefix(ca, "text:")) {