diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-12-03T02·08+0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-12-03T02·08+0000 |
commit | 7951c3c5460324c652d42f5f92bcae44e0a0b9c7 (patch) | |
tree | da8595f52e710af3313a177cc73a1a1b0cfffe87 /src/libstore/build.cc | |
parent | 714fa24cfb5afeb144549e0cc4808cc2a1c459cf (diff) |
* Some hackery to propagate the worker's stderr and exceptions to the
client.
Diffstat (limited to 'src/libstore/build.cc')
-rw-r--r-- | src/libstore/build.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 71560b2d0c51..d8b90252b43b 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -872,7 +872,7 @@ static void drain(int fd) if (errno != EINTR) throw SysError("draining"); } else if (rd == 0) break; - else writeFull(STDERR_FILENO, buffer, rd); + else writeToStderr(buffer, rd); } } @@ -1610,7 +1610,7 @@ void DerivationGoal::handleChildOutput(int fd, const string & data) { if (fd == logPipe.readSide) { if (verbosity >= buildVerbosity) - writeFull(STDERR_FILENO, (unsigned char *) data.c_str(), data.size()); + writeToStderr((unsigned char *) data.c_str(), data.size()); writeFull(fdLogFile, (unsigned char *) data.c_str(), data.size()); } @@ -1923,7 +1923,7 @@ void SubstitutionGoal::handleChildOutput(int fd, const string & data) { assert(fd == logPipe.readSide); if (verbosity >= buildVerbosity) - writeFull(STDERR_FILENO, (unsigned char *) data.c_str(), data.size()); + writeToStderr((unsigned char *) data.c_str(), data.size()); /* Don't write substitution output to a log file for now. We probably should, though. */ } |