diff options
| author | Graham Christensen <graham@grahamc.com> | 2019-05-12T17·44-0400 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2019-05-12T17·44-0400 |
| commit | 73b797c207e1c7a0fd9059d2cf1e3479502f8f1b (patch) | |
| tree | d94d1b3130bc47aabf53ac6c6e1ec88e9eb4a3c9 | |
| parent | a5efe617862484ab7dd234a495d315e7b08aa519 (diff) | |
handleDiffHook: stop passing allowVfork
| -rw-r--r-- | src/libstore/build.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 8902e22bd8a7..b07461013cc2 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -461,7 +461,7 @@ static void commonChildInit(Pipe & logPipe) 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; if (diffHook != "" && settings.runDiffHook) { @@ -3213,7 +3213,6 @@ void DerivationGoal::registerOutputs() throw SysError(format("renaming '%1%' to '%2%'") % actualPath % dst); handleDiffHook( - !buildUser && !drv->isBuiltin(), buildUser ? buildUser->getUID() : getuid(), buildUser ? buildUser->getGID() : getgid(), path, dst, drvPath, tmpDir); @@ -3283,7 +3282,6 @@ void DerivationGoal::registerOutputs() : fmt("output '%1%' of '%2%' differs from previous round", i->second.path, drvPath); handleDiffHook( - !buildUser && !drv->isBuiltin(), buildUser ? buildUser->getUID() : getuid(), buildUser ? buildUser->getGID() : getgid(), prev, i->second.path, drvPath, tmpDir); |