lix-project/lix
20
57
Fork 31
Code Issues 348 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge branch 'show-trace' of https://github.com/fkz/nix-repl

Browse source
This commit is contained in:
Eelco Dolstra 2016-07-21 11:14:37 +02:00
parent 00ee039c27 828cf7b058
commit df32610dfa
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nix-repl.cc
View file

@ -14,6 +14,7 @@
#include "get-drvs.hh" #include "get-drvs.hh"
#include "derivations.hh" #include "derivations.hh"
#include "affinity.hh" #include "affinity.hh"
#include "globals.hh"
using namespace std; using namespace std;
using namespace nix; using namespace nix;
@ -115,6 +116,7 @@ NixRepl::NixRepl(const Strings & searchPath, nix::ref<Store> store)
void NixRepl::mainLoop(const Strings & files) void NixRepl::mainLoop(const Strings & files)
{ {
string error = ANSI_RED "error:" ANSI_NORMAL " ";
std::cout << "Welcome to Nix version " << NIX_VERSION << ". Type :? for help." << std::endl << std::endl; std::cout << "Welcome to Nix version " << NIX_VERSION << ". Type :? for help." << std::endl << std::endl;
for (auto & i : files) for (auto & i : files)
@ -145,12 +147,12 @@ void NixRepl::mainLoop(const Strings & files)
// input without clearing the input so far. // input without clearing the input so far.
continue; continue;
} else { } else {
printMsg(lvlError, "error: " + e.msg()); printMsg(lvlError, format(error + "%1%%2%") % (settings.showTrace ? e.prefix() : "") % e.msg());
} }
} catch (Error & e) { } catch (Error & e) {
printMsg(lvlError, "error: " + e.msg()); printMsg(lvlError, format(error + "%1%%2%") % (settings.showTrace ? e.prefix() : "") % e.msg());
} catch (Interrupted & e) { } catch (Interrupted & e) {
printMsg(lvlError, "error: " + e.msg()); printMsg(lvlError, format(error + "%1%%2%") % (settings.showTrace ? e.prefix() : "") % e.msg());
} }
// We handled the current input fully, so we should clear it and read brand new input. // We handled the current input fully, so we should clear it and read brand new input.