Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 909b4a882057
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fd4911269f9a
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on May 6, 2020

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

    This reverts commit 3ebfbec, reversing
changes made to c089c52.

#3558
    @edolstra
    edolstra committed May 6, 2020
    Copy the full SHA
    fd49112 View commit details
Showing with 2 additions and 14 deletions.
  1. +2 −4 src/libstore/remote-store.cc
  2. +0 −10 src/libutil/logging.cc
6 changes: 2 additions & 4 deletions src/libstore/remote-store.cc
View file
Original file line number Diff line number Diff line change
@@ -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);
10 changes: 0 additions & 10 deletions src/libutil/logging.cc
View file
Original file line number Diff line number Diff line change
@@ -63,16 +63,6 @@ class SimpleLogger : public Logger
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