aboutsummaryrefslogtreecommitdiff
path: root/src/nix
diff options
context:
space:
mode:
authorBen Burdette <bburdette@gmail.com>2020-06-02 08:22:24 -0600
committerBen Burdette <bburdette@gmail.com>2020-06-02 08:22:24 -0600
commitd82d230b4015c50e698e3be1ec7a3e12277a3251 (patch)
treea37b7c45eb868aa15339dae10b3f43e35899fb46 /src/nix
parent734283d636318b6dfc249afe1ddbb20bb4d02ed4 (diff)
elide the 'ErrorInfo' in logError and logWarning calls
Diffstat (limited to 'src/nix')
-rw-r--r--src/nix/verify.cc26
1 files changed, 12 insertions, 14 deletions
diff --git a/src/nix/verify.cc b/src/nix/verify.cc
index 8c845bfc2..8ecd9a8f3 100644
--- a/src/nix/verify.cc
+++ b/src/nix/verify.cc
@@ -99,15 +99,14 @@ struct CmdVerify : StorePathsCommand
if (hash.first != info->narHash) {
corrupted++;
act2.result(resCorruptedPath, store->printStorePath(info->path));
- logError(
- ErrorInfo {
- .name = "Hash error - path modified",
- .hint = hintfmt(
- "path '%s' was modified! expected hash '%s', got '%s'",
- store->printStorePath(info->path),
- info->narHash.to_string(),
- hash.first.to_string())
- });
+ logError({
+ .name = "Hash error - path modified",
+ .hint = hintfmt(
+ "path '%s' was modified! expected hash '%s', got '%s'",
+ store->printStorePath(info->path),
+ info->narHash.to_string(),
+ hash.first.to_string())
+ });
}
}
@@ -156,11 +155,10 @@ struct CmdVerify : StorePathsCommand
if (!good) {
untrusted++;
act2.result(resUntrustedPath, store->printStorePath(info->path));
- logError(
- ErrorInfo {
- .name = "Untrusted path",
- .hint = hintfmt("path '%s' is untrusted",
- store->printStorePath(info->path))
+ logError({
+ .name = "Untrusted path",
+ .hint = hintfmt("path '%s' is untrusted",
+ store->printStorePath(info->path))
});
}