wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity

Ensure we're writing to stderr in the builder

Browse source 
http://hydra.nixos.org/build/17862041
This commit is contained in:
Eelco Dolstra 2014-12-12 14:35:44 +01:00
parent 5a2d451648
commit 28f22b4653
6 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libstore/build.cc
View file

@ -2166,7 +2166,7 @@ void DerivationGoal::runChild()
restoreSIGPIPE();
/* Indicate that we managed to set up the build environment. */
writeToStderr("\n");
writeFull(STDERR_FILENO, "\n");
/* Execute the program. This should not return. */
execve(program.c_str(), (char * *) &args[0], (char * *) envArr);
@ -2174,7 +2174,7 @@ void DerivationGoal::runChild()
throw SysError(format("executing ‘%1%’") % drv.builder);
} catch (std::exception & e) {
writeToStderr("while setting up the build environment: " + string(e.what()) + "\n");
writeFull(STDERR_FILENO, "while setting up the build environment: " + string(e.what()) + "\n");
_exit(1);
}
}
@ -2487,7 +2487,7 @@ void DerivationGoal::handleChildOutput(int fd, const string & data)
BZ2_bzWrite(&err, bzLogFile, (unsigned char *) data.data(), data.size());
if (err != BZ_OK) throw Error(format("cannot write to compressed log file (BZip2 error = %1%)") % err);
} else if (fdLogFile != -1)
writeFull(fdLogFile, (unsigned char *) data.data(), data.size());
writeFull(fdLogFile, data);
}
if (hook && fd == hook->fromHook.readSide)