From 399f9acee3be2825e93cdb0832f5b9e3e43fa283 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 7 Jul 2015 01:03:45 +0200 Subject: daemon: Flush upon '\r' when reading the substituter's stderr. This commit had been inadvertently reverted in 322eeb8. * nix/libstore/local-store.cc (LocalStore::getLineFromSubstituter): Flush when the line contains '\r'. --- nix/libstore/local-store.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'nix') diff --git a/nix/libstore/local-store.cc b/nix/libstore/local-store.cc index b2c78477b6..11f61ae030 100644 --- a/nix/libstore/local-store.cc +++ b/nix/libstore/local-store.cc @@ -1176,8 +1176,10 @@ string LocalStore::getLineFromSubstituter(RunningSubstituter & run) if (n == 0) throw EndOfFile(format("substituter `%1%' died unexpectedly") % run.program); err.append(buf, n); string::size_type p; - while ((p = err.find('\n')) != string::npos) { - printMsg(lvlError, run.program + ": " + string(err, 0, p)); + while (((p = err.find('\n')) != string::npos) + || ((p = err.find('\r')) != string::npos)) { + string thing(err, 0, p + 1); + writeToStderr(run.program + ": " + thing); err = string(err, p + 1); } } -- cgit v1.2.3