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

Merge pull request #8098 from hercules-ci/error-cc-Only-suggest-show-trace-when-truncated-trace-items-would-be-pri

Browse source 
error.cc: Only suggest `--show-trace` when relevant
This commit is contained in:
Théophane Hufschmitt 2023-03-24 12:07:44 +01:00 committed by GitHub
parent eed43de02f 233c4cf30f
commit a4c2cd3c06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libutil/error.cc
View file

@ -302,14 +302,14 @@ std::ostream & showErrorInfo(std::ostream & out, const ErrorInfo & einfo, bool s
if (!einfo.traces.empty()) { if (!einfo.traces.empty()) {
size_t count = 0; size_t count = 0;
for (const auto & trace : einfo.traces) { for (const auto & trace : einfo.traces) {
if (trace.hint.str().empty()) continue;
if (frameOnly && !trace.frame) continue;
if (!showTrace && count > 3) { if (!showTrace && count > 3) {
oss << "\n" << ANSI_WARNING "(stack trace truncated; use '--show-trace' to show the full trace)" ANSI_NORMAL << "\n"; oss << "\n" << ANSI_WARNING "(stack trace truncated; use '--show-trace' to show the full trace)" ANSI_NORMAL << "\n";
break; break;
} }
if (trace.hint.str().empty()) continue;
if (frameOnly && !trace.frame) continue;
count++; count++;
frameOnly = trace.frame; frameOnly = trace.frame;