[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=0fc6e05

The following commit has been merged in the master branch:
commit 0fc6e054ac082753e5d9ea0a320c6d067eb1fd63
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Feb 18 11:40:57 2015 +0100

    make sure symbol updates are executed with correct architecture order
    
    batchpatch is a bit spooky but I /think/ that order of architectures for
    -c needs to be the same as the order the logs are passed in.
    previously this wasn't necessarily the case so now we hard enforce this
    by creating a second array with the actual log file paths along with
    the previously used array for architectures. that way we get equally
    long arrays with same order that we can then simply join for the command
---
 kci/builder.rb | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/kci/builder.rb b/kci/builder.rb
index f1bcd49..4e0fd49 100644
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -313,12 +313,16 @@ def puts_lintian(data, args = {})
     end
 end
 
+# We need discrete arrays of both logs and architectures they represent
+# to make sure we process them in the correct order when updating symbols.
+logs = []
 architectures_with_log = []
 Dir.chdir('logs/') do
-    `gunzip *.log.gz`
-    Dir.glob('*.log').each do |log|
-        architectures_with_log << File.basename(log, '.log')
-    end
+  `gunzip *.log.gz`
+  Dir.glob('*.log').each do |log|
+    logs << "#{WORKSPACE_PATH}/logs/#{log}"
+    architectures_with_log << File.basename(log, '.log')
+  end
 end
 
 archindep = File.read('archindep').strip rescue 'amd64' # Get archindep from ppa script.
@@ -339,8 +343,8 @@ if project.stability == 'unstable' && log_data.match(/dpkg-gensymbols: warning:
                 system('git reset --hard')
                 captures = match.captures
                 captures.each do |lib_package|
-                    puts "pkgkde-symbolshelper batchpatch -v #{tar_version} -c #{architectures_with_log.join(',')} #{WORKSPACE_PATH}/logs/*.log"
-                    system("pkgkde-symbolshelper batchpatch -v #{tar_version} -c #{architectures_with_log.join(',')} #{WORKSPACE_PATH}/logs/*.log")
+                    puts "pkgkde-symbolshelper batchpatch -v #{tar_version} -c #{architectures_with_log.join(',')} #{logs.join(' ')}"
+                    system("pkgkde-symbolshelper batchpatch -v #{tar_version} -c #{architectures_with_log.join(',')} #{logs.join(' ')}")
                     updated_symbols = ($? == 0)
                     puts_info("Auto-updated symbols of #{lib_package}")
                 end

-- 
ci-tooling packaging