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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit be3002c970a10af2739eb4b850fc0151ee8917ee
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jun 4 17:52:01 2015 -0700

    add more verbosity
---
 kci/builder.rb          | 8 ++++++++
 kci/source_publisher.rb | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/kci/builder.rb b/kci/builder.rb
index 5db5ca8..240ddce 100755
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -208,11 +208,14 @@ end
 def timeout_spawn(cmd, timeout)
   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
@@ -235,15 +238,20 @@ Dir.chdir('build/source/') do
   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
   Dir.chdir('../..') do # main dir
+    puts "before require"
     require_relative 'source_publisher'
+    puts "after require; before new"
     publisher = SourcePublisher.new(changelog.name, changelog.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.
diff --git a/kci/source_publisher.rb b/kci/source_publisher.rb
index 840fb60..9906ca6 100755
--- a/kci/source_publisher.rb
+++ b/kci/source_publisher.rb
@@ -17,7 +17,7 @@ class SourcePublisher
   end
 
   def wait
-    puts "Waiting for source to get accepted...."
+    puts 'Waiting for source to get accepted....'
     # If it takes 20 minutes for the source to arrive it probably got rejected.
     fail_count = 20 # This is ~= minutes
 

-- 
ci-tooling packaging