NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-19 23:03:53 -04:00
Code Activity

Add "warning" verbosity level

Browse source 
This ensures that "nix" shows warnings. Previously these were hidden
because they were at "info" level.
This commit is contained in:
Eelco Dolstra 2019-06-17 09:12:03 +02:00
parent 8ea842260b
commit 615a9d031d
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libutil/logging.cc
View file

@ -21,7 +21,7 @@ Logger * logger = makeDefaultLogger();
void Logger::warn(const std::string & msg) void Logger::warn(const std::string & msg)
{ {
log(lvlInfo, ANSI_RED "warning:" ANSI_NORMAL " " + msg); log(lvlWarn, ANSI_RED "warning:" ANSI_NORMAL " " + msg);
} }
class SimpleLogger : public Logger class SimpleLogger : public Logger
@ -46,6 +46,7 @@ public:
char c; char c;
switch (lvl) { switch (lvl) {
case lvlError: c = '3'; break; case lvlError: c = '3'; break;
case lvlWarn: c = '4'; break;
case lvlInfo: c = '5'; break; case lvlInfo: c = '5'; break;
case lvlTalkative: case lvlChatty: c = '6'; break; case lvlTalkative: case lvlChatty: c = '6'; break;
default: c = '7'; default: c = '7';

1
src/libutil/logging.hh
View file

@ -6,6 +6,7 @@ namespace nix {
typedef enum { typedef enum {
lvlError = 0, lvlError = 0,
lvlWarn,
lvlInfo, lvlInfo,
lvlTalkative, lvlTalkative,
lvlChatty, lvlChatty,

2
src/nix/main.cc
View file

@ -102,7 +102,7 @@ void mainWrapped(int argc, char * * argv)
if (legacy) return legacy(argc, argv); if (legacy) return legacy(argc, argv);
} }
verbosity = lvlError; verbosity = lvlWarn;
settings.verboseBuild = false; settings.verboseBuild = false;
evalSettings.pureEval = true; evalSettings.pureEval = true;