Merge "Stop the logger in legacy commands again" into main
This commit is contained in:
commit
991d8ce275
1 changed files with 3 additions and 1 deletions
|
@ -353,6 +353,9 @@ void mainWrapped(int argc, char * * argv)
|
||||||
argv++; argc--;
|
argv++; argc--;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Clean up the progress bar if shown using --log-format in a legacy command too.
|
||||||
|
// Otherwise, this is a harmless no-op.
|
||||||
|
Finally f([] { logger->pause(); });
|
||||||
{
|
{
|
||||||
auto legacy = (*RegisterLegacyCommand::commands)[programName];
|
auto legacy = (*RegisterLegacyCommand::commands)[programName];
|
||||||
if (legacy) return legacy(argc, argv);
|
if (legacy) return legacy(argc, argv);
|
||||||
|
@ -361,7 +364,6 @@ void mainWrapped(int argc, char * * argv)
|
||||||
evalSettings.pureEval = true;
|
evalSettings.pureEval = true;
|
||||||
|
|
||||||
setLogFormat(LogFormat::bar);
|
setLogFormat(LogFormat::bar);
|
||||||
Finally f([] { logger->pause(); });
|
|
||||||
settings.verboseBuild = false;
|
settings.verboseBuild = false;
|
||||||
// FIXME: stop messing about with log verbosity depending on if it is interactive use
|
// FIXME: stop messing about with log verbosity depending on if it is interactive use
|
||||||
if (isatty(STDERR_FILENO)) {
|
if (isatty(STDERR_FILENO)) {
|
||||||
|
|
Loading…
Reference in a new issue