diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libmain/shared.cc | 4 | ||||
| -rw-r--r-- | src/libstore/globals.cc | 2 | ||||
| -rw-r--r-- | src/libutil/util.cc | 2 | ||||
| -rw-r--r-- | src/nix-env/main.cc | 3 |
4 files changed, 5 insertions, 6 deletions
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index 6aad03a37a..3f9b2a10d4 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -126,7 +126,9 @@ static void initAndRun(int argc, char * * argv) setLogType(*i); } else if (arg == "--build-output" || arg == "-B") - buildVerbosity = lvlError; /* lowest */ + ; /* !!! obsolete - remove eventually */ + else if (arg == "--no-build-output" || arg == "-Q") + buildVerbosity = lvlVomit; else if (arg == "--help") { printHelp(); return; diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index aad26501b7..44794d147a 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -12,6 +12,6 @@ bool keepGoing = false; bool tryFallback = false; -Verbosity buildVerbosity = lvlDebug; +Verbosity buildVerbosity = lvlInfo; unsigned int maxBuildJobs = 1; diff --git a/src/libutil/util.cc b/src/libutil/util.cc index 2a2dffb25d..a25665e4a8 100644 --- a/src/libutil/util.cc +++ b/src/libutil/util.cc @@ -243,7 +243,7 @@ void writeStringToFile(const Path & path, const string & s) LogType logType = ltPretty; -Verbosity verbosity = lvlError; +Verbosity verbosity = lvlInfo; static int nestingLevel = 0; diff --git a/src/nix-env/main.cc b/src/nix-env/main.cc index 8e5ba67e9b..3700f44899 100644 --- a/src/nix-env/main.cc +++ b/src/nix-env/main.cc @@ -704,9 +704,6 @@ static void opDefaultExpr(Globals & globals, void run(Strings args) { - /* Use a higher default verbosity (lvlInfo). */ - verbosity = (Verbosity) ((int) verbosity + 1); - Strings opFlags, opArgs; Operation op = 0; |