diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-05 21:49:01 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-05 21:49:01 +0000 |
| commit | a38ab99d576bb31288edb8a68c9564d962415662 (patch) | |
| tree | 883f2b1fdaaa5e241cd71e1f786c3f2aaf1813ba /src/nix/repl.cc | |
| parent | 8313f0e939a99b1f715695c0e798cfb368dfc1f2 (diff) | |
| parent | 14227aeb327798a1446ddde59fc561c3d2e6b7a8 (diff) | |
Merge remote-tracking branch 'upstream/master' into derivation-header-include-order
Diffstat (limited to 'src/nix/repl.cc')
| -rw-r--r-- | src/nix/repl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nix/repl.cc b/src/nix/repl.cc index d5661f7b7..ab8ae41e8 100644 --- a/src/nix/repl.cc +++ b/src/nix/repl.cc @@ -211,12 +211,12 @@ void NixRepl::mainLoop(const std::vector<std::string> & files) // input without clearing the input so far. continue; } else { - printMsg(lvlError, error + "%1%%2%", (settings.showTrace ? e.prefix() : ""), e.msg()); + printMsg(lvlError, e.msg()); } } catch (Error & e) { - printMsg(lvlError, error + "%1%%2%", (settings.showTrace ? e.prefix() : ""), e.msg()); + printMsg(lvlError, e.msg()); } catch (Interrupted & e) { - printMsg(lvlError, error + "%1%%2%", (settings.showTrace ? e.prefix() : ""), e.msg()); + printMsg(lvlError, e.msg()); } // We handled the current input fully, so we should clear it |