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

all things error to error.hh

Browse source
This commit is contained in:
Ben Burdette 2020-04-24 14:57:51 -06:00
parent d9632765a8
commit d8d4844b88
5 changed files with 30 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libmain/shared.cc
View file

@ -281,6 +281,8 @@ int handleExceptions(const string & programName, std::function<void()> fun)
{
ReceiveInterrupts receiveInterrupts; // FIXME: need better place for this
ErrorInfo::programName = programName;
string error = ANSI_RED "error:" ANSI_NORMAL " ";
try {
try {
@ -296,12 +298,15 @@ int handleExceptions(const string & programName, std::function<void()> fun)
} catch (Exit & e) {
return e.status;
} catch (UsageError & e) {
// TODO: switch to logError
// logError(e.info());
printError(
format(error + "%1%\nTry '%2% --help' for more information.")
format("%1%\nTry '%2% --help' for more information.")
% e.what() % programName);
return 1;
} catch (BaseError & e) {
printError(error + "%1%%2%", (settings.showTrace ? e.prefix() : ""), e.msg());
// logError(e.info());
printError("%1%%2%", (settings.showTrace ? e.prefix() : ""), e.msg());
if (e.prefix() != "" && !settings.showTrace)
printError("(use '--show-trace' to show detailed location information)");
return e.status;