kloenk/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Remove duplicate "error:"

Browse source
This commit is contained in:
Eelco Dolstra 2022-04-08 11:48:30 +02:00
parent 8bd9ebf52c
commit c68963eaea
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/build-result.hh
View file

@ -31,6 +31,8 @@ struct BuildResult
ResolvesToAlreadyValid, ResolvesToAlreadyValid,
NoSubstituters, NoSubstituters,
} status = MiscFailure; } status = MiscFailure;
// FIXME: include entire ErrorInfo object.
std::string errorMsg; std::string errorMsg;
std::string toString() const { std::string toString() const {

3
src/libstore/build/derivation-goal.cc
View file

@ -1371,8 +1371,7 @@ void DerivationGoal::done(
{ {
buildResult.status = status; buildResult.status = status;
if (ex) if (ex)
// FIXME: strip: "error: " buildResult.errorMsg = fmt("%s", normaltxt(ex->info().msg));
buildResult.errorMsg = ex->what();
if (buildResult.status == BuildResult::TimedOut) if (buildResult.status == BuildResult::TimedOut)
worker.timedOut = true; worker.timedOut = true;
if (buildResult.status == BuildResult::PermanentFailure) if (buildResult.status == BuildResult::PermanentFailure)