diff options
author | Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com> | 2023-03-24 12:07:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-24 12:07:44 +0100 |
commit | a4c2cd3c06ae8a0ce35f1bbaa932bcb23916c13f (patch) | |
tree | 9d6f38293f0769319ca2d22bc22211243764f603 | |
parent | eed43de02f15c450934edfb7acc7b8df37a7c388 (diff) | |
parent | 233c4cf30ffa3615259348111f16e16132a50dad (diff) |
Merge pull request #8098 from hercules-ci/error-cc-Only-suggest-show-trace-when-truncated-trace-items-would-be-pri
error.cc: Only suggest `--show-trace` when relevant
-rw-r--r-- | src/libutil/error.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libutil/error.cc b/src/libutil/error.cc index e4f0d4677..c9d61942a 100644 --- a/src/libutil/error.cc +++ b/src/libutil/error.cc @@ -302,14 +302,14 @@ std::ostream & showErrorInfo(std::ostream & out, const ErrorInfo & einfo, bool s if (!einfo.traces.empty()) { size_t count = 0; for (const auto & trace : einfo.traces) { + if (trace.hint.str().empty()) continue; + if (frameOnly && !trace.frame) continue; + if (!showTrace && count > 3) { oss << "\n" << ANSI_WARNING "(stack trace truncated; use '--show-trace' to show the full trace)" ANSI_NORMAL << "\n"; break; } - if (trace.hint.str().empty()) continue; - if (frameOnly && !trace.frame) continue; - count++; frameOnly = trace.frame; |