diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-05-01 13:21:39 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-05-01 13:21:39 +0200 |
| commit | 470553bd0572c4010407acb4e410b45a521e5f11 (patch) | |
| tree | 14993ee22500d880259fbff812f023ad8af001a8 /src/libstore/local-store.cc | |
| parent | 4ddd077bfa9ad497e795a7f60d7734daf62117c1 (diff) | |
Don't let stderr writes in substituters cause a deadlock
Diffstat (limited to 'src/libstore/local-store.cc')
| -rw-r--r-- | src/libstore/local-store.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index 687ad7e47..dce57f751 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -1007,6 +1007,10 @@ void LocalStore::startSubstituter(const Path & substituter, RunningSubstituter & fromPipe.create(); errorPipe.create(); + /* Hack: prevent substituters that write too much to stderr from + deadlocking our read() from stdout. */ + fcntl(errorPipe.writeSide, F_SETFL, O_NONBLOCK); + setSubstituterEnv(); run.pid = maybeVfork(); |