diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-05-20 12:11:34 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-05-20 12:13:39 +0200 |
| commit | 4627ea587750886f5de5ac42cc69c89e260ef690 (patch) | |
| tree | 41378e646fea5e6a9b79431a90933ec11f39059f /nix | |
| parent | 820a40327dfd075f03c8cbe336f955f45e3e60ef (diff) | |
| download | guix-4627ea587750886f5de5ac42cc69c89e260ef690.tar guix-4627ea587750886f5de5ac42cc69c89e260ef690.tar.gz | |
daemon: Correctly print substituter's stderr.
* nix/libstore/local-store.cc (LocalStore::getLineFromSubstituter): Reinstate
commit 9ba0b8d. Fixes a regression introduced in 2bb0490.
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/libstore/local-store.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nix/libstore/local-store.cc b/nix/libstore/local-store.cc index a890ab56b3..a115f65847 100644 --- a/nix/libstore/local-store.cc +++ b/nix/libstore/local-store.cc @@ -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); } } |