Merge "Stop the logger in legacy commands again" into main

1 files changed, 3 insertions, 1 deletions

diff --git a/src/nix/main.cc b/src/nix/main.cc
index 05c40db03..4a3a7b4e7 100644
--- a/src/nix/main.cc
+++ b/src/nix/main.cc
@@ -353,6 +353,9 @@ void mainWrapped(int argc, char * * argv)
         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];
         if (legacy) return legacy(argc, argv);
@@ -361,7 +364,6 @@ void mainWrapped(int argc, char * * argv)
     evalSettings.pureEval = true;
 
     setLogFormat(LogFormat::bar);
-    Finally f([] { logger->pause(); });
     settings.verboseBuild = false;
     // FIXME: stop messing about with log verbosity depending on if it is interactive use
     if (isatty(STDERR_FILENO)) {