diff options
| -rw-r--r-- | doc/manual/opt-common-syn.xml | 4 | ||||
| -rw-r--r-- | doc/manual/opt-common.xml | 13 | ||||
| -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 |
6 files changed, 13 insertions, 15 deletions
diff --git a/doc/manual/opt-common-syn.xml b/doc/manual/opt-common-syn.xml index f848ad249909..033189d0b919 100644 --- a/doc/manual/opt-common-syn.xml +++ b/doc/manual/opt-common-syn.xml @@ -2,8 +2,8 @@ <arg><option>--version</option></arg> <arg rep='repeat'><option>--verbose</option></arg> <arg rep='repeat'><option>-v</option></arg> -<arg><option>--build-output</option></arg> -<arg><option>-B</option></arg> +<arg><option>--no-build-output</option></arg> +<arg><option>-Q</option></arg> <arg> <group choice='req'> <arg choice='plain'><option>--max-jobs</option></arg> diff --git a/doc/manual/opt-common.xml b/doc/manual/opt-common.xml index db8a60ecad6e..0cfd6ba215d2 100644 --- a/doc/manual/opt-common.xml +++ b/doc/manual/opt-common.xml @@ -50,7 +50,7 @@ <para> <quote>Informational</quote>: print <emphasis>useful</emphasis> messages about what Nix is - doing. + doing. This is the default. </para> </listitem> </varlistentry> @@ -94,14 +94,13 @@ <varlistentry> - <term><option>--build-output</option> / <option>-B</option></term> + <term><option>--no-build-output</option> / <option>-Q</option></term> <listitem> <para> - Causes the output written by build actions to standard output - and standard error to be echoed to standard error, regardless of - verbosity level. By default, it is only echoed at a verbosity - level of at least 4 (<quote>Debug</quote>), and is suppressed at - lower levels. Note that it is always written to a log file in + By default, output written by builders to standard output and + standard error is echoed to the Nix command's standard error. + This option suppresses this behaviour. Note that the builder's + standard output and error are always written to a log file in <filename><replaceable>prefix</replaceable>/nix/var/log/nix</filename>. </para> </listitem> diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index 6aad03a37a98..3f9b2a10d4ea 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 aad26501b735..44794d147a77 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 2a2dffb25d6f..a25665e4a88c 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 8e5ba67e9bb2..3700f44899b9 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; |