summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-06-17 09:12:03 +0200
committerEelco Dolstra <edolstra@gmail.com>2019-06-17 09:12:03 +0200
commit615a9d031d22a6aee64f8511e15685e47b6f8796 (patch)
treeddf37d4cf86f100ed440abe17f2133c94a0e252f
parent8ea842260b4fd93315d35c5ba94b1ff99ab391d8 (diff)
Add "warning" verbosity level
This ensures that "nix" shows warnings. Previously these were hidden because they were at "info" level.
-rw-r--r--src/libutil/logging.cc3
-rw-r--r--src/libutil/logging.hh1
-rw-r--r--src/nix/main.cc2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/libutil/logging.cc b/src/libutil/logging.cc
index 799c6e1ae..b379306f6 100644
--- a/src/libutil/logging.cc
+++ b/src/libutil/logging.cc
@@ -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';
diff --git a/src/libutil/logging.hh b/src/libutil/logging.hh
index 678703102..5f2219445 100644
--- a/src/libutil/logging.hh
+++ b/src/libutil/logging.hh
@@ -6,6 +6,7 @@ namespace nix {
typedef enum {
lvlError = 0,
+ lvlWarn,
lvlInfo,
lvlTalkative,
lvlChatty,
diff --git a/src/nix/main.cc b/src/nix/main.cc
index a1fcb892a..ced87f653 100644
--- a/src/nix/main.cc
+++ b/src/nix/main.cc
@@ -102,7 +102,7 @@ void mainWrapped(int argc, char * * argv)
if (legacy) return legacy(argc, argv);
}
- verbosity = lvlError;
+ verbosity = lvlWarn;
settings.verboseBuild = false;
evalSettings.pureEval = true;