From fd4911269f9a9ce0f9647c5fb88658074f654eff Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 6 May 2020 10:54:01 +0200
Subject: [PATCH] Revert "Merge pull request #3558 from LnL7/ssh-ng-stderr"

This reverts commit 3ebfbecdd187002569257f7cb183bf9e0b39af1e, reversing
changes made to c089c52d5f1cff888552f485775b74226dcbe618.

https://github.com/NixOS/nix/pull/3558
---
 src/libstore/remote-store.cc |  6 ++----
 src/libutil/logging.cc       | 10 ----------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 07ef79382..8c55da268 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -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);
diff --git a/src/libutil/logging.cc b/src/libutil/logging.cc
index 777650de5..3cc4ef8f1 100644
--- a/src/libutil/logging.cc
+++ b/src/libutil/logging.cc
@@ -63,16 +63,6 @@ public:
         writeToStderr(prefix + filterANSIEscapes(fs.s, !tty) + "\n");
     }
 
-    void result(ActivityId act, ResultType type, const std::vector<Field> & fields) override
-    {
-        if (type == resBuildLogLine || type == resPostBuildLogLine) {
-            assert(0 < fields.size());
-            assert(fields[0].type == Logger::Field::tString);
-            auto lastLine = fields[0].s;
-            log(lvlInfo, lastLine);
-        }
-    }
-
     void startActivity(ActivityId act, Verbosity lvl, ActivityType type,
         const std::string & s, const Fields & fields, ActivityId parent)
         override