~ruther/guix-local: daemon: Correctly print substituter's stderr.

4627ea587750886f5de5ac42cc69c89e260ef690 — Ludovic Courtès 11 years ago 820a403

daemon: Correctly print substituter's stderr.

* nix/libstore/local-store.cc (LocalStore::getLineFromSubstituter): Reinstate
  commit 9ba0b8d.  Fixes a regression introduced in 2bb0490.

patch browse .tar.gz

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

@@ 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);
             }
         }