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

* FreeBSD returns ESRCH when there are no processes to kill.

Browse source
This commit is contained in:
Eelco Dolstra 2006-12-05 18:07:46 +00:00
parent 8d1854c3f1
commit 4c1c37d0b6
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/libstore/build.cc
View file

@ -450,11 +450,15 @@ static void killUser(uid_t uid)
if (setuid(uid) == -1) abort(); if (setuid(uid) == -1) abort();
if (kill(-1, SIGKILL) == -1) while (true) {
throw SysError(format("cannot kill processes for UID `%1%'") % uid); 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) { } 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(1);
} }
quickExit(0); quickExit(0);
@ -965,7 +969,7 @@ DerivationGoal::HookReply DerivationGoal::tryBuildHook()
throw SysError(format("executing `%1%'") % buildHook); throw SysError(format("executing `%1%'") % buildHook);
} catch (std::exception & e) { } 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); quickExit(1);
} }