wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 04:21:16 +02:00
Code Activity

showTrace flag for ErrorInfo; showTrace test.

Browse source
This commit is contained in:
Ben Burdette 2020-06-25 09:23:12 -06:00
parent 9c0e1fd4f1
commit 9ab808c926
4 changed files with 61 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libmain/shared.cc
View file

@ -303,6 +303,7 @@ int handleExceptions(const string & programName, std::function<void()> fun)
ReceiveInterrupts receiveInterrupts; // FIXME: need better place for this
ErrorInfo::programName = baseNameOf(programName);
ErrorInfo::showTrace = settings.showTrace;
string error = ANSI_RED "error:" ANSI_NORMAL " ";
try {
@ -323,9 +324,6 @@ int handleExceptions(const string & programName, std::function<void()> fun)
printError("Try '%1% --help' for more information.", programName);
return 1;
} catch (BaseError & e) {
// TODO showTrace as argument, or have calcWhat check settings?
// if (settings.showTrace && e.prefix() != "")
// printError(e.prefix());
logError(e.info());
// TODO fix to detect non-empty trace here.
if (e.hasTrace() && !settings.showTrace)