From ffb2ae54beb5796cd408fbe15d2d2da09ff37adf Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 20 May 2020 01:10:44 +0100 Subject: chore(third_party/nix): Dump of minor accumulated changes None of these are worthy of a specific commit, or even have a real reason behind them, but I didn't want to lose them. --- third_party/nix/src/libmain/shared.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'third_party/nix/src/libmain') diff --git a/third_party/nix/src/libmain/shared.cc b/third_party/nix/src/libmain/shared.cc index 332bd5c4caee..f63fe9c11c5a 100644 --- a/third_party/nix/src/libmain/shared.cc +++ b/third_party/nix/src/libmain/shared.cc @@ -313,8 +313,8 @@ int handleExceptions(const string& programName, std::function fun) { return e.status; } catch (UsageError& e) { LOG(INFO) << e.what(); - LOG(INFO) << "Try '" - << " --help' for more information." << programName; + LOG(INFO) << "Try '" << programName << " " + << " --help' for more information."; return 1; } catch (BaseError& e) { LOG(ERROR) << error << (settings.showTrace ? e.prefix() : "") << e.msg(); @@ -323,7 +323,7 @@ int handleExceptions(const string& programName, std::function fun) { } return e.status; } catch (std::bad_alloc& e) { - LOG(ERROR) << error << "out of memory"; + LOG(ERROR) << error << "failed to allocate: " << e.what(); return 1; } catch (std::exception& e) { LOG(ERROR) << error << e.what(); -- cgit 1.4.1