summaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-01-05 22:51:03 +0100
committerLudovic Courtès <ludo@gnu.org>2015-02-07 23:16:56 +0100
commit9ba0b8d3d09a83c03ea3e296239e5e8c986a6bb7 (patch)
treedd20166fbc0ffb03c66ff536986ad02f026792cc /nix
parent46b8aadbd6f4673aad27f6425f48a3b3ac5c88dc (diff)
downloadpatches-9ba0b8d3d09a83c03ea3e296239e5e8c986a6bb7.tar
patches-9ba0b8d3d09a83c03ea3e296239e5e8c986a6bb7.tar.gz
daemon: Flush upon '\r' when reading the substituter's stderr.
* nix/libstore/local-store.cc (LocalStore::getLineFromSubstituter): Flush when the line contains '\r'.
Diffstat (limited to 'nix')
-rw-r--r--nix/libstore/local-store.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/nix/libstore/local-store.cc b/nix/libstore/local-store.cc
index 5d210ae017..2c3d65215c 100644
--- a/nix/libstore/local-store.cc
+++ b/nix/libstore/local-store.cc
@@ -1168,8 +1168,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);
}
}