From 4627ea587750886f5de5ac42cc69c89e260ef690 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 20 May 2015 12:11:34 +0200 Subject: daemon: Correctly print substituter's stderr. * nix/libstore/local-store.cc (LocalStore::getLineFromSubstituter): Reinstate commit 9ba0b8d. Fixes a regression introduced in 2bb0490. --- nix/libstore/local-store.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nix') diff --git a/nix/libstore/local-store.cc b/nix/libstore/local-store.cc index a890ab56b3..a115f65847 100644 --- a/nix/libstore/local-store.cc +++ b/nix/libstore/local-store.cc @@ -1165,7 +1165,8 @@ string LocalStore::getLineFromSubstituter(RunningSubstituter & run) string::size_type p; while (((p = err.find('\n')) != string::npos) || ((p = err.find('\r')) != string::npos)) { - printMsg(lvlError, run.program + ": " + string(err, 0, p)); + string thing(err, 0, p + 1); + writeToStderr(run.program + ": " + thing); err = string(err, p + 1); } } -- cgit 1.4.1