mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

handleDiffHook: stop passing allowVfork

Browse source
This commit is contained in:
Graham Christensen 2019-05-12 13:44:22 -04:00
parent a5efe61786
commit 73b797c207
No known key found for this signature in database
GPG key ID: ACA1C1D120C83D5C
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/build.cc
View file

@ -461,7 +461,7 @@ static void commonChildInit(Pipe & logPipe)
close(fdDevNull); close(fdDevNull);
} }
void handleDiffHook(bool allowVfork, uid_t uid, uid_t gid, Path tryA, Path tryB, Path drvPath, Path tmpDir) void handleDiffHook(uid_t uid, uid_t gid, Path tryA, Path tryB, Path drvPath, Path tmpDir)
{ {
auto diffHook = settings.diffHook; auto diffHook = settings.diffHook;
if (diffHook != "" && settings.runDiffHook) { if (diffHook != "" && settings.runDiffHook) {
@ -3213,7 +3213,6 @@ void DerivationGoal::registerOutputs()
throw SysError(format("renaming '%1%' to '%2%'") % actualPath % dst); throw SysError(format("renaming '%1%' to '%2%'") % actualPath % dst);
handleDiffHook( handleDiffHook(
!buildUser && !drv->isBuiltin(),
buildUser ? buildUser->getUID() : getuid(), buildUser ? buildUser->getUID() : getuid(),
buildUser ? buildUser->getGID() : getgid(), buildUser ? buildUser->getGID() : getgid(),
path, dst, drvPath, tmpDir); path, dst, drvPath, tmpDir);
@ -3283,7 +3282,6 @@ void DerivationGoal::registerOutputs()
: fmt("output '%1%' of '%2%' differs from previous round", i->second.path, drvPath); : fmt("output '%1%' of '%2%' differs from previous round", i->second.path, drvPath);
handleDiffHook( handleDiffHook(
!buildUser && !drv->isBuiltin(),
buildUser ? buildUser->getUID() : getuid(), buildUser ? buildUser->getUID() : getuid(),
buildUser ? buildUser->getGID() : getgid(), buildUser ? buildUser->getGID() : getgid(),
prev, i->second.path, drvPath, tmpDir); prev, i->second.path, drvPath, tmpDir);