mirror of
https://github.com/NixOS/nix
synced 2025-07-03 02:01:48 +02:00
* Option `-B' to always show the output of builders, regardless of
verbosity level.
This commit is contained in:
parent
3495d153b3
commit
ff9af107d3
7 changed files with 27 additions and 1 deletions
|
@ -51,6 +51,8 @@ static void initAndRun(int argc, char * * argv)
|
|||
string arg = *i;
|
||||
if (arg == "--verbose" || arg == "-v")
|
||||
verbosity = (Verbosity) ((int) verbosity + 1);
|
||||
else if (arg == "--build-output" || arg == "-B")
|
||||
buildVerbosity = lvlError; /* lowest */
|
||||
else if (arg == "--help") {
|
||||
printHelp();
|
||||
return;
|
||||
|
|
|
@ -22,7 +22,7 @@ void runProgram(const string & program,
|
|||
{
|
||||
/* Create a log file. */
|
||||
string logCommand =
|
||||
verbosity >= lvlDebug
|
||||
verbosity >= buildVerbosity
|
||||
? "tee " + logFileName + " >&2"
|
||||
: "cat > " + logFileName;
|
||||
/* !!! auto-pclose on exit */
|
||||
|
|
|
@ -7,3 +7,5 @@ string nixStateDir = "/UNINIT";
|
|||
string nixDBPath = "/UNINIT";
|
||||
|
||||
bool keepFailed = false;
|
||||
|
||||
Verbosity buildVerbosity = lvlDebug;
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
#define __GLOBALS_H
|
||||
|
||||
#include <string>
|
||||
#include "util.hh"
|
||||
|
||||
using namespace std;
|
||||
|
||||
|
@ -28,5 +29,8 @@ extern string nixDBPath;
|
|||
/* Whether to keep temporary directories of failed builds. */
|
||||
extern bool keepFailed;
|
||||
|
||||
/* Verbosity level for build output. */
|
||||
extern Verbosity buildVerbosity;
|
||||
|
||||
|
||||
#endif /* !__GLOBALS_H */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue