mirror of
https://github.com/NixOS/nix
synced 2025-06-27 08:31:16 +02:00
Revert "Merge pull request #6204 from layus/coerce-string"
This reverts commita75b7ba30f
, reversing changes made to9af16c5f74
.
This commit is contained in:
parent
98f57f44bb
commit
9b33ef3879
31 changed files with 865 additions and 988 deletions
|
@ -404,6 +404,8 @@ 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