mirror of
https://github.com/NixOS/nix
synced 2025-06-27 00:11:17 +02:00
Revert "Revert "Merge pull request #6204 from layus/coerce-string""
This reverts commit 9b33ef3879
.
This commit is contained in:
parent
38b90c618f
commit
e4726a0c79
31 changed files with 986 additions and 863 deletions
|
@ -404,8 +404,6 @@ int handleExceptions(const std::string & programName, std::function<void()> fun)
|
|||
return 1;
|
||||
} catch (BaseError & e) {
|
||||
logError(e.info());
|
||||
if (e.hasTrace() && !loggerSettings.showTrace.get())
|
||||
printError("(use '--show-trace' to show detailed location information)");
|
||||
return e.status;
|
||||
} catch (std::bad_alloc & e) {
|
||||
printError(error + "out of memory");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue