Merge pull request #6651 from ncfavier/nix-build-stop-logger

nix-build: stop logger when appropriate
This commit is contained in:
Théophane Hufschmitt 2022-06-13 10:43:14 +02:00 committed by GitHub
commit 03226aa053
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -543,6 +543,8 @@ static void main_nix_build(int argc, char * * argv)
restoreProcessContext(); restoreProcessContext();
logger->stop();
execvp(shell->c_str(), argPtrs.data()); execvp(shell->c_str(), argPtrs.data());
throw SysError("executing shell '%s'", *shell); throw SysError("executing shell '%s'", *shell);
@ -601,6 +603,8 @@ static void main_nix_build(int argc, char * * argv)
outPaths.push_back(outputPath); outPaths.push_back(outputPath);
} }
logger->stop();
for (auto & path : outPaths) for (auto & path : outPaths)
std::cout << store->printStorePath(path) << '\n'; std::cout << store->printStorePath(path) << '\n';
} }