01/03: daemon: Flush upon '\r' when reading the substituter's stderr.

[Ludovic Courtès]

civodul pushed a commit to branch wip-http-pipelining
in repository guix.

commit 3328abcf3c3f8c4d78ec8a635ef2efabd3d667b4
Author: Ludovic Courtès <address@hidden>
Date:   Mon Jan 5 22:51:03 2015 +0100

    daemon: Flush upon '\r' when reading the substituter's stderr.
    
    * nix/libstore/local-store.cc (LocalStore::getLineFromSubstituter):
      Flush when the line contains '\r'.
---
 nix/libstore/local-store.cc |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nix/libstore/local-store.cc b/nix/libstore/local-store.cc
index 5d210ae..2c3d652 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);
             }
         }