aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2011-04-19 10:44:44 +0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2011-04-19 10:44:44 +0000
commit8c69dac8a1d25c043ddb27d5c8dde5b072030667 (patch)
tree83befb053007e05445753308a4b27f9bb48936df
parent4ba6afaf48db8d4cece83a6e22de26829907834f (diff)
* Handle error messages from the Nix worker containing the `%'
character. (Nix/216)
-rw-r--r--src/libstore/remote-store.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index ae99846a3..568a6aa58 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -512,7 +512,7 @@ void RemoteStore::processStderr(Sink * sink, Source * source)
if (msg == STDERR_ERROR) {
string error = readString(from);
unsigned int status = GET_PROTOCOL_MINOR(daemonVersion) >= 8 ? readInt(from) : 1;
- throw Error(error, status);
+ throw Error(format("%1%") % error, status);
}
else if (msg != STDERR_LAST)
throw Error("protocol error processing standard error");