[SCM] ci-tooling packaging branch, master, updated. 9898d033e20fe2ff6c98fb0e3a830884b03a3fdd

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 07d35910653d9961e8d419dace26e7c7ccf178a4
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Oct 8 12:45:11 2015 +0200

    remove timeout debug
---
 kci/builder.rb | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/kci/builder.rb b/kci/builder.rb
index b1fd7d0..eb50872 100755
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -71,20 +71,15 @@ class KCIBuilder
       4.times do |count|
         # Note: count starts at 0 ;)
         if timeout_spawn(dput, 60 * (30.0 / (count + 1)))
-          puts "spawn timeout goody"
           success = true
           break
         end
-        puts "spawn timout badly"
         sleep(60) # Sleep for a minute
       end
-      abort '		 !!!!!!!!!!!! dput failed two times !!!!!!!!!!!!' unless success
+      abort '		 !!!!!!!!!! dput failed two times !!!!!!!!!!' unless success
       Dir.chdir('..') do # main dir
-        puts "before require"
         require_relative 'source_publisher'
-        puts "after require; before new"
         publisher = SourcePublisher.new(source.name, source.version, project.stability)
-        puts "after new"
         abort 'PPA Build Failed' unless publisher.wait
         # Write upload data to file, we perhaps want to do something outside the
         # build container.
@@ -244,30 +239,16 @@ class KCIBuilder
 
   # Upload
   def self.timeout_spawn(cmd, timeout)
-    thread = Thread.new do
-      loop do
-        warn '---- ps aux ----'
-        warn `ps aux |grep dput`
-        warn '----'
-        sleep 60
-      end
-    end
-
     pid = Process.spawn(cmd, pgroup: true)
     begin
-      puts "waitpid with timeout"
       Timeout.timeout(timeout) do
         Process.waitpid(pid, 0)
-        puts "return wait pid"
         return ($?.exitstatus == 0)
       end
     rescue Timeout::Error
-      puts "timeout error"
       Process.kill(15, -Process.getpgid(pid))
       return false
     end
-  ensure
-    thread.kill
   end
 
   def self.puts_kci(type, str)

-- 
ci-tooling packaging