diff options
| author | Harald Sitter <sitter@kde.org> | 2015-08-07 12:17:10 (GMT) |
|---|---|---|
| committer | Harald Sitter <sitter@kde.org> | 2015-08-07 12:17:10 (GMT) |
| commit | ad287d3e20d62c6a52e373b3b6f702015cc0e19b (patch) | |
| tree | f27a8dc51f54062e2acd63c89242fd5f701bd94b | |
| parent | 86e9ba69eb46fd57f00510adf8a05cab93689f26 (diff) | |
instead of disabling the symbol tracking, remove the symbols files
this way the builds cannot fail on symbol divergence at all
| -rwxr-xr-x | kci/builder.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kci/builder.rb b/kci/builder.rb index 8f19fc0..2cba685 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 @@ -415,10 +415,10 @@ end archindep = File.read('archindep').strip rescue 'amd64' # Get archindep from ppa script. log_data = File.open("logs/#{archindep}.log").read -updated_symbols = true +updated_symbols = false # FIXME: stability wtf gensymbols_regex = %r{dpkg-gensymbols: warning: (.*)/symbols doesn't match completely debian/(.*).symbols} -if !updated_symbols && project.series == KCI.latest_series && log_data.match(gensymbols_regex) +if 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/) |
