Skip to content

Commit

Permalink
Remove duplicate "error:"
Browse files Browse the repository at this point in the history
  • Loading branch information
edolstra committed Apr 8, 2022
1 parent 8bd9ebf commit c68963e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 2 additions & 0 deletions src/libstore/build-result.hh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ struct BuildResult
ResolvesToAlreadyValid,
NoSubstituters,
} status = MiscFailure;

// FIXME: include entire ErrorInfo object.
std::string errorMsg;

std::string toString() const {
Expand Down
3 changes: 1 addition & 2 deletions src/libstore/build/derivation-goal.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1371,8 +1371,7 @@ void DerivationGoal::done(
{
buildResult.status = status;
if (ex)
// FIXME: strip: "error: "
buildResult.errorMsg = ex->what();
buildResult.errorMsg = fmt("%s", normaltxt(ex->info().msg));
if (buildResult.status == BuildResult::TimedOut)
worker.timedOut = true;
if (buildResult.status == BuildResult::PermanentFailure)
Expand Down

0 comments on commit c68963e

Please sign in to comment.