maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(3p/nix/libutil): Replace chomp() with absl::strings

Browse source
This commit is contained in:
Vincent Ambo 2020-05-24 01:36:11 +01:00
parent 10481d2586
commit 06d7b4aebd
15 changed files with 40 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

7
third_party/nix/src/build-remote/build-remote.cc vendored
View file

@ -6,6 +6,8 @@
#include <set>
#include <tuple>
#include <absl/strings/ascii.h>
#include <absl/strings/str_cat.h>
#include <glog/logging.h>
#include "derivations.hh"
@ -199,9 +201,10 @@ static int _main(int argc, char* argv[]) {
storeUri = bestMachine->storeUri;
} catch (std::exception& e) {
auto msg = chomp(drainFD(5, false));
auto msg = absl::StripTrailingAsciiWhitespace(drainFD(5, false));
LOG(ERROR) << "cannot build on '" << bestMachine->storeUri
<< "': " << e.what() << (msg.empty() ? "" : ": " + msg);
<< "': " << e.what()
<< (msg.empty() ? "" : absl::StrCat(": ", msg));
bestMachine->enabled = false;
continue;
}