nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

daemon: Correctly print substituter's stderr. 

* nix/libstore/local-store.cc (LocalStore::getLineFromSubstituter): Reinstate
  commit 9ba0b8d.  Fixes a regression introduced in 2bb0490.
This commit is contained in:
Ludovic Courtès 2015-05-20 12:11:34 +02:00
parent 820a40327d
commit 4627ea5877
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nix/libstore/local-store.cc
View File

@ -1165,7 +1165,8 @@ string LocalStore::getLineFromSubstituter(RunningSubstituter & run)
string::size_type p; string::size_type p;
while (((p = err.find('\n')) != string::npos) while (((p = err.find('\n')) != string::npos)
|| ((p = err.find('\r')) != 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); err = string(err, p + 1);
} }
} }