nix: Ensure that the user sees errors from substituters

This commit is contained in:
Eelco Dolstra 2018-02-09 15:05:41 +01:00
parent aa02cdc33c
commit 960e9c560e
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE

View file

@ -3688,8 +3688,8 @@ void SubstitutionGoal::tryNext()
&& !sub->isTrusted && !sub->isTrusted
&& !info->checkSignatures(worker.store, worker.store.publicKeys)) && !info->checkSignatures(worker.store, worker.store.publicKeys))
{ {
printInfo(format("warning: substituter '%s' does not have a valid signature for path '%s'") printError("warning: substituter '%s' does not have a valid signature for path '%s'",
% sub->getUri() % storePath); sub->getUri(), storePath);
tryNext(); tryNext();
return; return;
} }
@ -3779,7 +3779,7 @@ void SubstitutionGoal::finished()
try { try {
promise.get_future().get(); promise.get_future().get();
} catch (Error & e) { } catch (Error & e) {
printInfo(e.msg()); printError(e.msg());
/* Try the next substitute. */ /* Try the next substitute. */
state = &SubstitutionGoal::tryNext; state = &SubstitutionGoal::tryNext;