Author: eelco
Date: Tue Apr 19 10:44:44 2011
New Revision: 26885
URL: https://svn.nixos.org/websvn/nix/?rev=26885&sc=1
Log:
* Handle error messages from the Nix worker containing the `%'
character. (Nix/216)
Modified:
nix/trunk/src/libstore/remote-store.cc
Modified: nix/trunk/src/libstore/remote-store.cc
==============================================================================
--- nix/trunk/src/libstore/remote-store.cc Mon Apr 18 19:41:34 2011
(r26884)
+++ nix/trunk/src/libstore/remote-store.cc Tue Apr 19 10:44:44 2011
(r26885)
@@ -512,7 +512,7 @@
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");
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
