[SCM] ci-tooling packaging branch, master, updated. 963f0501361eb2f914555a800ff0f6929a0d24a3

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=963f050

The following commit has been merged in the master branch:
commit 963f0501361eb2f914555a800ff0f6929a0d24a3
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jun 4 20:37:41 2015 -0700

    kill
---
 kci/builder.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kci/builder.rb b/kci/builder.rb
index 7b18f57..ffb439c 100755
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -206,7 +206,7 @@ end
 
 # Upload
 def timeout_spawn(cmd, timeout)
-  Thread.new do
+  thread = Thread.new do
     loop do
       warn '---- ps aux ----'
       warn `ps aux |grep dput`
@@ -228,6 +228,8 @@ def timeout_spawn(cmd, timeout)
     Process.kill(15, -Process.getpgid(pid))
     return false
   end
+ensure
+  thread.kill
 end
 
 Dir.chdir('build/source/') do

-- 
ci-tooling packaging