Add "warning" verbosity level

This ensures that "nix" shows warnings. Previously these were hidden
because they were at "info" level.

(cherry picked from commit 615a9d031d22a6aee64f8511e15685e47b6f8796)
This commit is contained in:
Eelco Dolstra 2019-06-17 09:12:03 +02:00
parent 64ec087f58
commit 5600b070a7
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 4 additions and 2 deletions

View file

@ -21,7 +21,7 @@ Logger * logger = makeDefaultLogger();
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
@ -46,6 +46,7 @@ public:
char c;
switch (lvl) {
case lvlError: c = '3'; break;
case lvlWarn: c = '4'; break;
case lvlInfo: c = '5'; break;
case lvlTalkative: case lvlChatty: c = '6'; break;
default: c = '7';

View file

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

View file

@ -93,7 +93,7 @@ void mainWrapped(int argc, char * * argv)
if (legacy) return legacy(argc, argv);
}
verbosity = lvlError;
verbosity = lvlWarn;
settings.verboseBuild = false;
NixArgs args;