diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-07-10 18:13:45 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2020-07-10 18:13:45 -0400 |
| commit | acb74d4d94b38295d606ed45dc074b3e9083e188 (patch) | |
| tree | 92cc4bfdd1d97bae6484e5038943c17f2b190f60 /src/libmain/shared.cc | |
| parent | fc2ab42e86e0b75250a666eeb5e25705a2ab83ef (diff) | |
| parent | 8efa23bb996161af74f89401902450e51e9d4b54 (diff) | |
Merge remote-tracking branch 'origin/master' into substitute-other-storedir
Diffstat (limited to 'src/libmain/shared.cc')
| -rw-r--r-- | src/libmain/shared.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index 1cb422967..52718c231 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -323,10 +323,8 @@ int handleExceptions(const string & programName, std::function<void()> fun) printError("Try '%1% --help' for more information.", programName); return 1; } catch (BaseError & e) { - if (settings.showTrace && e.prefix() != "") - printError(e.prefix()); logError(e.info()); - if (e.prefix() != "" && !settings.showTrace) + if (e.hasTrace() && !loggerSettings.showTrace.get()) printError("(use '--show-trace' to show detailed location information)"); return e.status; } catch (std::bad_alloc & e) { |