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

Harald Sitter apachelogger-guest at moszumanska.debian.org
Thu Oct 8 09:05:25 UTC 2015


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

The following commit has been merged in the master branch:
commit fbdea4498f0736662a2fb4171c80afb985ee7c2d
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Oct 8 11:02:44 2015 +0200

    fix a retraction handling error
    
    retractions are identified by a string
---
 kci/builder.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kci/builder.rb b/kci/builder.rb
index 333ac2d..9fe6837 100755
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -404,7 +404,9 @@ class KCIBuilder
     gensymbols_regex = %r{dpkg-gensymbols: warning: (.*)/symbols doesn't match completely debian/(.*).symbols}
     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')
+      if log_data.include?('warning: some symbols or patterns disappeared in the symbols file')
+        puts_error('It would very much appear that symbols have been retracted')
+      else
         match = log_data.match(/--- debian\/(.*).symbols/)
         if match && match.size > 1
           Dir.chdir('packaging') do
@@ -432,8 +434,6 @@ class KCIBuilder
           puts_error('Failed to update symbols as the package name(s) could not be'\
                      ' parsed.')
         end
-      else
-        puts_error('It would very much appear that symbols have been retracted')
       end
     end
     updated_symbols

-- 
ci-tooling packaging



More information about the pkg-kde-commits mailing list