TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of "killing <pid>" message for unused build hooks

This commit is contained in:
Eelco Dolstra 2014-08-04 17:27:45 +02:00 committed by Ludovic Courtès
parent 42c6246f67
commit 75f746f018
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nix/libstore/build.cc
View File

@ -635,7 +635,7 @@ HookInstance::HookInstance()
HookInstance::~HookInstance()
{
try {
pid.kill();
pid.kill(true);
} catch (...) {
ignoreException();
}

5
nix/libutil/util.cc
View File

@ -740,11 +740,12 @@ Pid::operator pid_t()
}
void Pid::kill()
void Pid::kill(bool quiet)
{
if (pid == -1 || pid == 0) return;
printMsg(lvlError, format("killing process %1%") % pid);
if (!quiet)
printMsg(lvlError, format("killing process %1%") % pid);
/* Send the requested signal to the child. If it has its own
process group, send the signal to every process in the child

2
nix/libutil/util.hh
View File

@ -253,7 +253,7 @@ public:
~Pid();
void operator =(pid_t pid);
operator pid_t();
void kill();
void kill(bool quiet = false);
int wait(bool block);
void setSeparatePG(bool separatePG);
void setKillSignal(int signal);