85/118: Get rid of "killing <pid>" message for unused build hooks

[Ludovic Courtès]

civodul pushed a commit to branch nix
in repository guix.

commit 75f746f018e34868b8057bed87c90d2cbe2c0b6c
Author: Eelco Dolstra <address@hidden>
Date:   Mon Aug 4 17:27:45 2014 +0200

    Get rid of "killing <pid>" message for unused build hooks
---
 nix/libstore/build.cc |    2 +-
 nix/libutil/util.cc   |    5 +++--
 nix/libutil/util.hh   |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index e6f7c56..9b9f3d2 100644
--- a/nix/libstore/build.cc
+++ b/nix/libstore/build.cc
@@ -635,7 +635,7 @@ HookInstance::HookInstance()
 HookInstance::~HookInstance()
 {
     try {
-        pid.kill();
+        pid.kill(true);
     } catch (...) {
         ignoreException();
     }
diff --git a/nix/libutil/util.cc b/nix/libutil/util.cc
index b792120..22f49f7 100644
--- a/nix/libutil/util.cc
+++ b/nix/libutil/util.cc
@@ -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
diff --git a/nix/libutil/util.hh b/nix/libutil/util.hh
index cf513c0..7e538ea 100644
--- a/nix/libutil/util.hh
+++ b/nix/libutil/util.hh
@@ -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);