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

9
third_party/nix/src/libstore/build.cc vendored
View file

@ -12,6 +12,7 @@
#include <sstream>
#include <thread>
#include <absl/strings/ascii.h>
#include <fcntl.h>
#include <grp.h>
#include <netdb.h>
@ -461,7 +462,7 @@ void handleDiffHook(uid_t uid, uid_t gid, Path tryA, Path tryB, Path drvPath,
}
if (!diffRes.second.empty()) {
LOG(ERROR) << chomp(diffRes.second);
LOG(ERROR) << absl::StripTrailingAsciiWhitespace(diffRes.second);
}
} catch (Error& error) {
LOG(ERROR) << "diff hook execution failed: " << error.what();
@ -1640,7 +1641,8 @@ MakeError(NotDeterministic, BuildError)
hookEnvironment.emplace("DRV_PATH", drvPath);
hookEnvironment.emplace("OUT_PATHS",
chomp(concatStringsSep(" ", outputPaths)));
absl::StripTrailingAsciiWhitespace(
concatStringsSep(" ", outputPaths)));
RunOptions opts(settings.postBuildHook, {});
opts.environment = hookEnvironment;
@ -1788,7 +1790,8 @@ HookReply DerivationGoal::tryBuildHook() {
} catch (SysError& e) {
if (e.errNo == EPIPE) {
LOG(ERROR) << "build hook died unexpectedly: "
<< chomp(drainFD(worker.hook->fromHook.readSide.get()));
<< absl::StripTrailingAsciiWhitespace(
drainFD(worker.hook->fromHook.readSide.get()));
worker.hook = nullptr;
return rpDecline;
}