nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 03:56:01 +01:00
Code Activity

Merge pull request #13677 from NixOS/mergify/bp/2.28-maintenance/pr-13248

Browse source 
libmain: Catch logger exceptions in `handleExceptions` (backport #13248)
This commit is contained in:
Sergei Zimmerman 2025-08-03 00:10:24 +03:00 • committed by GitHub
commit 49062664ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libmain/shared.cc
View file

@ -336,6 +336,7 @@ int handleExceptions(const std::string & programName, std::function<void()> fun)
ErrorInfo::programName = baseNameOf(programName); ErrorInfo::programName = baseNameOf(programName);
std::string error = ANSI_RED "error:" ANSI_NORMAL " "; std::string error = ANSI_RED "error:" ANSI_NORMAL " ";
try {
try { try {
try { try {
fun(); fun();
@ -363,6 +364,10 @@ int handleExceptions(const std::string & programName, std::function<void()> fun)
printError(error + e.what()); printError(error + e.what());
return 1; return 1;
} }
} catch (...) {
/* In case logger also throws just give up. */
return 1;
}
return 0; return 0;
} }