Merge lewurm/buildbot:printusedsignal (PR #1096)

buildbot · Mar 25, 2014 · 0cb72ba · 0cb72ba
2 parents 1b6bd3e + b78bd69
commit 0cb72ba
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/slave/buildslave/runprocess.py b/slave/buildslave/runprocess.py
@@ -893,11 +893,12 @@ def doBackupTimeout(self):
         log.msg("we tried to kill the process, and it wouldn't die.."
                 " finish anyway")
         self.killTimer = None
-        self.sendStatus({'header': "SIGKILL failed to kill process\n"})
+        signalName = "SIG" + self.interruptSignal
+        self.sendStatus({'header': signalName + " failed to kill process\n"})
         if self.sendRC:
             self.sendStatus({'header': "using fake rc=-1\n"})
             self.sendStatus({'rc': -1})
-        self.failed(RuntimeError("SIGKILL failed to kill process"))
+        self.failed(RuntimeError(signalName + " failed to kill process"))
 
     def _cancelTimers(self):
         for timerName in ('ioTimeoutTimer', 'killTimer', 'maxTimeoutTimer', 'sendBuffersTimer', 'sigtermTimer'):