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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 6cadd31380869905e6a4699264387f44b67f4d73
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Feb 18 11:41:07 2015 +0100

    sync with live version
---
 kci/builder.rb | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/kci/builder.rb b/kci/builder.rb
index 4e0fd49..5e5f8ed 100644
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -2,6 +2,7 @@
 
 require 'date'
 require 'fileutils'
+require 'json'
 require 'timeout'
 require_relative 'lib/debian/changelog'
 
@@ -138,10 +139,16 @@ Dir.chdir('build/source/') do
             success = true
             break
         end
+        sleep(60) # Sleep for a minute
     end
     raise '		 !!!!!!!!!!!!!!!! dput failed two times !!!!!!!!!!!!!!!!' unless success
     Dir.chdir('../..') do # main dir
         raise 'PPA Interaction Failed' unless system("#{File.expand_path(File.dirname(__FILE__))}/ppa-wait.py #{changelog.name} #{changelog.version} #{project.stability}")
+        # Write upload data to file, we perhaps want to do something outside the build container.
+        data = { :name => changelog.name,
+                 :version => changelog.version,
+                 :type => project.stability }
+        File.write('source.json', JSON.generate(data))
     end
 end
 
@@ -223,7 +230,7 @@ end
 def puts_cmake(data, source_name)
     data = segmentify(data, "dh_auto_configure", "dh_auto_build")
     return if data.empty?
-    
+
     missing = []
     warnings = []
     while not data.empty?
@@ -236,18 +243,18 @@ def puts_cmake(data, source_name)
             warnings += cmake_parse_warning(line)
         end
     end
-    
+
     missing.uniq!
     warnings.uniq!
-    
+
     puts "KCI::CMAKE"
-    
+
     ignore_missing = []
     cmake_ignore_path = "#{WORKSPACE_PATH}/packaging/debian/meta/cmake-ignore"
     if File.exist?(cmake_ignore_path)
         ignore_missing += File.read(cmake_ignore_path).strip.split("
")
     end
-    
+
     missing.each do |dep|
         p dep
         p ignore_missing
@@ -264,7 +271,7 @@ def puts_cmake(data, source_name)
         next if ignore
         puts_warning("Missing Dep: #{dep}")
     end
-    
+
     warnings.each do |warning|
         puts_warning(warning)
     end
@@ -286,21 +293,21 @@ def puts_lintian(data, args = {})
     puts "KCI::LINTIAN"
     data.each do |line|
         next if line.start_with?('warning: ') # random warnings from lintian itself
-        
+
         # Package names can easily go beyond what shit can suck on, so gag it.
         next if line.include?('source-package-component-has-long-file-name')
         next if line.include?('package-has-long-file-name')
-        
+
         # We really do not care about standards versions for now. They only ever get
         # bumped by the pkg-kde team anyway.
         next if line.include?('out-of-date-standards-version')
         next if line.include?('newer-standards-version')
-        
+
         # Do not print symbols warnings if we already auto-updated.
         if args[:updated_symbols] and line.include?('symbols-file-contains-current-version-with-debian-revision')
             next
         end
-        
+
         case line[0..1]
         when 'W:'
             puts_warning(line)
@@ -366,5 +373,3 @@ puts_list_missing(log_data)
 puts_lintian(log_data, :updated_symbols => updated_symbols)
 
 # TODO: try to figure out when a qml dep is needed and make sure it is there...
-
-

-- 
ci-tooling packaging