From 8c69dac8a1d25c043ddb27d5c8dde5b072030667 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue, 19 Apr 2011 10:44:44 +0000
Subject: * Handle error messages from the Nix worker containing the `%'  
 character.  (Nix/216)

---
 src/libstore/remote-store.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index ae99846a3dfb..568a6aa58a35 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");
-- 
cgit 1.4.1