From b1eb25217217087cb70a730da5311bd0890cf6ad Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Dec 2010 11:28:26 +0000 Subject: * Propagate the "100" exit status for failed builds through the Nix daemon. --- src/nix-worker/nix-worker.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/nix-worker') diff --git a/src/nix-worker/nix-worker.cc b/src/nix-worker/nix-worker.cc index ec5ca58aa0d1..0fa1b40aede9 100644 --- a/src/nix-worker/nix-worker.cc +++ b/src/nix-worker/nix-worker.cc @@ -178,7 +178,7 @@ static void startWork() /* stopWork() means that we're done; stop sending stderr to the client. */ -static void stopWork(bool success = true, const string & msg = "") +static void stopWork(bool success = true, const string & msg = "", unsigned int status = 0) { /* Stop handling async client death; we're going to a state where we're either sending or receiving from the client, so we'll be @@ -192,6 +192,7 @@ static void stopWork(bool success = true, const string & msg = "") else { writeInt(STDERR_ERROR, to); writeString(msg, to); + if (status != 0) writeInt(status, to); } } @@ -637,7 +638,7 @@ static void processConnection() try { performOp(clientVersion, from, to, op); } catch (Error & e) { - stopWork(false, e.msg()); + stopWork(false, e.msg(), GET_PROTOCOL_MINOR(clientVersion) >= 8 ? e.status : 0); } assert(!canSendStderr); -- cgit 1.4.1