108/118: Improve error message if the daemon worker fails to start

[Ludovic Courtès]

civodul pushed a commit to branch nix
in repository guix.

commit 1129a982c4e77ff465fd6102627477900af2f7f4
Author: Eelco Dolstra <address@hidden>
Date:   Fri Oct 31 09:36:09 2014 +0100

    Improve error message if the daemon worker fails to start
---
 nix/libstore/remote-store.cc |    3 +--
 nix/nix-daemon/nix-daemon.cc |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/nix/libstore/remote-store.cc b/nix/libstore/remote-store.cc
index f5fd141..448d9b6 100644
--- a/nix/libstore/remote-store.cc
+++ b/nix/libstore/remote-store.cc
@@ -87,8 +87,7 @@ void RemoteStore::openConnection(bool reserveSpace)
         processStderr();
     }
     catch (Error & e) {
-        throw Error(format("cannot start worker (%1%)")
-            % e.msg());
+        throw Error(format("cannot start daemon worker: %1%") % e.msg());
     }
 
     setOptions();
diff --git a/nix/nix-daemon/nix-daemon.cc b/nix/nix-daemon/nix-daemon.cc
index e74074f..2fa3632 100644
--- a/nix/nix-daemon/nix-daemon.cc
+++ b/nix/nix-daemon/nix-daemon.cc
@@ -704,7 +704,7 @@ static void processConnection(bool trusted)
         to.flush();
 
     } catch (Error & e) {
-        stopWork(false, e.msg());
+        stopWork(false, e.msg(), GET_PROTOCOL_MINOR(clientVersion) >= 8 ? 1 : 
0);
         to.flush();
         return;
     }