Skip to content

Commit c2782d7

Browse files
authored
Merge pull request #13853 from obsidiansystems/no-old-debugging-aid
Revert "Add a crude tracing mechansim for the build results"
2 parents 2eacb3c + 0590b13 commit c2782d7

File tree

3 files changed

+0
-55
lines changed

3 files changed

+0
-55
lines changed

src/libstore/build/derivation-building-goal.cc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1368,13 +1368,6 @@ DerivationBuildingGoal::done(BuildResult::Status status, SingleDrvOutputs builtO
13681368

13691369
worker.updateProgress();
13701370

1371-
auto traceBuiltOutputsFile = getEnv("_NIX_TRACE_BUILT_OUTPUTS").value_or("");
1372-
if (traceBuiltOutputsFile != "") {
1373-
std::fstream fs;
1374-
fs.open(traceBuiltOutputsFile, std::fstream::out);
1375-
fs << worker.store.printStorePath(drvPath) << "\t" << buildResult.toString() << std::endl;
1376-
}
1377-
13781371
return amDone(buildResult.success() ? ecSuccess : ecFailed, std::move(ex));
13791372
}
13801373

src/libstore/build/derivation-goal.cc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -364,13 +364,6 @@ DerivationGoal::done(BuildResult::Status status, std::optional<Realisation> buil
364364

365365
worker.updateProgress();
366366

367-
auto traceBuiltOutputsFile = getEnv("_NIX_TRACE_BUILT_OUTPUTS").value_or("");
368-
if (traceBuiltOutputsFile != "") {
369-
std::fstream fs;
370-
fs.open(traceBuiltOutputsFile, std::fstream::out);
371-
fs << worker.store.printStorePath(drvPath) << "\t" << buildResult.toString() << std::endl;
372-
}
373-
374367
return amDone(buildResult.success() ? ecSuccess : ecFailed, std::move(ex));
375368
}
376369

src/libstore/include/nix/store/build-result.hh

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -46,47 +46,6 @@ struct BuildResult
4646
*/
4747
std::string errorMsg;
4848

49-
std::string toString() const
50-
{
51-
auto strStatus = [&]() {
52-
switch (status) {
53-
case Built:
54-
return "Built";
55-
case Substituted:
56-
return "Substituted";
57-
case AlreadyValid:
58-
return "AlreadyValid";
59-
case PermanentFailure:
60-
return "PermanentFailure";
61-
case InputRejected:
62-
return "InputRejected";
63-
case OutputRejected:
64-
return "OutputRejected";
65-
case TransientFailure:
66-
return "TransientFailure";
67-
case CachedFailure:
68-
return "CachedFailure";
69-
case TimedOut:
70-
return "TimedOut";
71-
case MiscFailure:
72-
return "MiscFailure";
73-
case DependencyFailed:
74-
return "DependencyFailed";
75-
case LogLimitExceeded:
76-
return "LogLimitExceeded";
77-
case NotDeterministic:
78-
return "NotDeterministic";
79-
case ResolvesToAlreadyValid:
80-
return "ResolvesToAlreadyValid";
81-
case NoSubstituters:
82-
return "NoSubstituters";
83-
default:
84-
return "Unknown";
85-
};
86-
}();
87-
return strStatus + ((errorMsg == "") ? "" : " : " + errorMsg);
88-
}
89-
9049
/**
9150
* How many times this build was performed.
9251
*/

0 commit comments

Comments
 (0)