diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-31 09:36:09 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-05-11 17:38:34 +0200 |
| commit | 1129a982c4e77ff465fd6102627477900af2f7f4 (patch) | |
| tree | b19f4ecc8969e479b3ba12505b8071761811fe32 /nix | |
| parent | bed17f40fce27e1a31f70957b1d0dd912b58700d (diff) | |
| download | guix-1129a982c4e77ff465fd6102627477900af2f7f4.tar.gz | |
Improve error message if the daemon worker fails to start
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/libstore/remote-store.cc | 3 | ||||
| -rw-r--r-- | 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 f5fd141325..448d9b6bc1 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 e74074f2a3..2fa3632dfe 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; } |