nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-15 23:12:44 +01:00
Code Activity

Revert "Merge pull request #3558 from LnL7/ssh-ng-stderr"

Browse source 
This reverts commit 3ebfbecdd1, reversing
changes made to c089c52d5f.

https://github.com/NixOS/nix/pull/3558
This commit is contained in:
Eelco Dolstra 2020-05-06 10:54:01 +02:00
parent 909b4a8820
commit fd4911269f
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libstore/remote-store.cc
View file

@ -779,10 +779,8 @@ std::exception_ptr RemoteStore::Connection::processStderr(Sink * sink, Source *
return std::make_exception_ptr(Error(status, error));
}
else if (msg == STDERR_NEXT) {
string s = chomp(readString(from));
printMsg(lvlVomit, "stderr %s", s);
}
else if (msg == STDERR_NEXT)
printError(chomp(readString(from)));
else if (msg == STDERR_START_ACTIVITY) {
auto act = readNum<ActivityId>(from);