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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit dd34d6a92f56bba50b5920939b43da0b533ee702
Author: Harald Sitter <sitter at kde.org>
Date:   Fri May 29 10:10:50 2015 +0200

    wire up builder to the source_publisher instead of forking into ppa-wait.py
    
    the python script tonight (again) got stuck for hours on end outputting
    nothing at all eventually coming back with the final failure but having
    printed absolutely nothing in between (even though it should have...)
    
    I therefore lost all trust in that script and even with the straight ruby
    port having terrible design and all that it probably can't beat failing
    for no apparent reason
---
 kci/builder.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kci/builder.rb b/kci/builder.rb
index 745ffe3..c6b3058 100755
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -242,7 +242,9 @@ Dir.chdir('build/source/') do
   end
   abort '		 !!!!!!!!!!!! dput failed two times !!!!!!!!!!!!' unless success
   Dir.chdir('../..') do # main dir
-    abort 'PPA Interaction Failed' unless system("#{File.expand_path(File.dirname(__FILE__))}/ppa-wait.py #{changelog.name} #{changelog.version} #{project.stability}")
+    require_relative 'source_publisher'
+    publisher = SourcePublisher.new(changelog.name, changelog.version, project.stability)
+    abort 'PPA Build Failed' unless publisher.wait
     # Write upload data to file, we perhaps want to do something outside the
     # build container.
     data = { :name => changelog.name,

-- 
ci-tooling packaging