mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-10 08:16:15 +02:00
* FreeBSD returns ESRCH when there are no processes to kill.
This commit is contained in:
parent
8d1854c3f1
commit
4c1c37d0b6
1 changed files with 8 additions and 4 deletions
|
@ -450,11 +450,15 @@ static void killUser(uid_t uid)
|
|||
|
||||
if (setuid(uid) == -1) abort();
|
||||
|
||||
if (kill(-1, SIGKILL) == -1)
|
||||
throw SysError(format("cannot kill processes for UID `%1%'") % uid);
|
||||
while (true) {
|
||||
if (kill(-1, SIGKILL) == 0) break;
|
||||
if (errno == ESRCH) break; /* no more processes */
|
||||
if (errno != EINTR)
|
||||
throw SysError(format("cannot kill processes for UID `%1%'") % uid);
|
||||
}
|
||||
|
||||
} catch (std::exception & e) {
|
||||
std::cerr << format("build error: %1%\n") % e.what();
|
||||
std::cerr << format("killing build users: %1%\n") % e.what();
|
||||
quickExit(1);
|
||||
}
|
||||
quickExit(0);
|
||||
|
@ -965,7 +969,7 @@ DerivationGoal::HookReply DerivationGoal::tryBuildHook()
|
|||
throw SysError(format("executing `%1%'") % buildHook);
|
||||
|
||||
} catch (std::exception & e) {
|
||||
std::cerr << format("build error: %1%\n") % e.what();
|
||||
std::cerr << format("build hook error: %1%\n") % e.what();
|
||||
}
|
||||
quickExit(1);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue