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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 3129dd43e43e7b6511678fec300279e4d2ebe4a6
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Sep 16 12:04:59 2015 +0200

    Revert "instead of disabling the symbol tracking, remove the symbols files"
    
    This reverts commit ad287d3e20d62c6a52e373b3b6f702015cc0e19b.
---
 kci/builder.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kci/builder.rb b/kci/builder.rb
index b3d8604..98d27f1 100755
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -162,12 +162,12 @@ Dir.chdir('build/source/') do
     end
   end
   # Rip out symbol files unless we are on latest
-  # unless project.series == KCI.latest_series
+  unless project.series == KCI.latest_series
     symbols = Dir.glob('debian/symbols') +
               Dir.glob('debian/*.symbols') +
               Dir.glob('debian/*.symbols.*')
     symbols.each { |s| FileUtils.rm(s) }
-  # end
+  end
 end
 
 # dpkg-buildpackage
@@ -419,10 +419,10 @@ end
 archindep = File.read('archindep').strip rescue 'amd64' # Get archindep from ppa script.
 log_data = File.open("logs/#{archindep}.log").read
 
-updated_symbols = false
+updated_symbols = true
 # FIXME: stability wtf
 gensymbols_regex = %r{dpkg-gensymbols: warning: (.*)/symbols doesn't match completely debian/(.*).symbols}
-if project.series == KCI.latest_series && log_data.match(gensymbols_regex)
+if !updated_symbols && project.series == KCI.latest_series && log_data.match(gensymbols_regex)
   puts 'KCI::SYMBOLS'
   if log_data.include?('dpkg-gensymbols: warning: some new symbols appeared')
     match = log_data.match(/--- debian\/(.*).symbols/)

-- 
ci-tooling packaging