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

Merge pull request #14353 from NixOS/backport-14343-to-2.31-maintenance

Browse source 
[Backport 2.31-maintenance] Revert "libmain: Catch logger exceptions in `handleExceptions`"
This commit is contained in:
internal-nix-ci[bot] 2025-10-24 23:59:16 +00:00 • committed by GitHub
commit 3cca112d79
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 22 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libmain/shared.cc
View file

@ -318,7 +318,6 @@ 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();
@ -346,10 +345,6 @@ 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;
} }