TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve error message if the daemon worker fails to start

This commit is contained in:
Eelco Dolstra 2014-10-31 09:36:09 +01:00 committed by Ludovic Courtès
parent bed17f40fc
commit 1129a982c4
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nix/libstore/remote-store.cc
View File

@ -87,8 +87,7 @@ void RemoteStore::openConnection(bool reserveSpace)
processStderr(); processStderr();
} }
catch (Error & e) { catch (Error & e) {
throw Error(format("cannot start worker (%1%)") throw Error(format("cannot start daemon worker: %1%") % e.msg());
% e.msg());
} }
setOptions(); setOptions();

2
nix/nix-daemon/nix-daemon.cc
View File

@ -704,7 +704,7 @@ static void processConnection(bool trusted)
to.flush(); to.flush();
} catch (Error & e) { } catch (Error & e) {
stopWork(false, e.msg()); stopWork(false, e.msg(), GET_PROTOCOL_MINOR(clientVersion) >= 8 ? 1 : 0);
to.flush(); to.flush();
return; return;
} }