diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-12-17T11·28+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-12-17T11·28+0000 |
| commit | b1eb25217217087cb70a730da5311bd0890cf6ad (patch) | |
| tree | a95273ff41849891960d878d9935bb82771bafcd /src/libstore | |
| parent | eac93d6efeba68d9da95f01e10cd859eef6d85dd (diff) | |
* Propagate the "100" exit status for failed builds through the Nix
daemon.
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/remote-store.cc | 7 | ||||
| -rw-r--r-- | src/libstore/worker-protocol.hh | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index 26093a5d3abc..ae99846a3dfb 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -509,8 +509,11 @@ void RemoteStore::processStderr(Sink * sink, Source * source) writeToStderr((const unsigned char *) s.c_str(), s.size()); } } - if (msg == STDERR_ERROR) - throw Error(readString(from)); + if (msg == STDERR_ERROR) { + string error = readString(from); + unsigned int status = GET_PROTOCOL_MINOR(daemonVersion) >= 8 ? readInt(from) : 1; + throw Error(error, status); + } else if (msg != STDERR_LAST) throw Error("protocol error processing standard error"); } diff --git a/src/libstore/worker-protocol.hh b/src/libstore/worker-protocol.hh index d77049bc7188..acb8bc8b2948 100644 --- a/src/libstore/worker-protocol.hh +++ b/src/libstore/worker-protocol.hh @@ -8,7 +8,7 @@ namespace nix { #define WORKER_MAGIC_1 0x6e697863 #define WORKER_MAGIC_2 0x6478696f -#define PROTOCOL_VERSION 0x107 +#define PROTOCOL_VERSION 0x108 #define GET_PROTOCOL_MAJOR(x) ((x) & 0xff00) #define GET_PROTOCOL_MINOR(x) ((x) & 0x00ff) |