maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(third_party/nix): Dump of minor accumulated changes

Browse source 
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.
This commit is contained in:
Vincent Ambo 2020-05-20 01:10:44 +01:00
parent ddd059e0fa
commit ffb2ae54be
5 changed files with 5 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
third_party/nix/src/libmain/shared.cc vendored
View file

@ -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();