~ruther/guix-local

1b1f557d888fa84b1bc818f1b221776355a7a2dd — Tobias Geerinckx-Rice 4 years ago 3887c1f
daemon: Print the line whence we expect an integer.

* nix/libstore/local-store.cc (LocalStore::getLineFromSubstituter):
Include the malformed substituter stream line in the error message.
1 files changed, 2 insertions(+), 1 deletions(-)

M nix/libstore/local-store.cc
M nix/libstore/local-store.cc => nix/libstore/local-store.cc +2 -1
@@ 839,7 839,8 @@ template<class T> T LocalStore::getIntLineFromSubstituter(Agent & run)
{
    string s = getLineFromSubstituter(run);
    T res;
    if (!string2Int(s, res)) throw Error("integer expected from stream");
    if (!string2Int(s, res))
        throw Error(format("integer expected from stream: %1%") % s);
    return res;
}