about summary refs log tree commit diff
path: root/third_party/nix/src/libmain/shared.cc
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-20T00·10+0100
committerVincent Ambo <tazjin@google.com>2020-05-20T00·10+0100
commitffb2ae54beb5796cd408fbe15d2d2da09ff37adf (patch)
treeef26eeb1526149b1569c6295fb3297469099bf7e /third_party/nix/src/libmain/shared.cc
parentddd059e0fa97662fe2c8340f44ffc753491ce9ef (diff)
chore(third_party/nix): Dump of minor accumulated changes r/780
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.
Diffstat (limited to 'third_party/nix/src/libmain/shared.cc')
-rw-r--r--third_party/nix/src/libmain/shared.cc6
1 files changed, 3 insertions, 3 deletions
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<void()> 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<void()> 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();