[SCM] ci-tooling packaging branch, master, updated. 4548da7c54ac02208ca43b7fad47835b3388e60b

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 4548da7c54ac02208ca43b7fad47835b3388e60b
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Oct 8 07:30:40 2015 +0200

    somewhat fix stability handling
    
    this still risks running into merge fail but that is a somewhat distinct
    problem
---
 kci/builder.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kci/builder.rb b/kci/builder.rb
index ae0cccc..eb5eb4e 100755
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -182,7 +182,7 @@ class KCIBuilder
     updated_symbols = false
     # 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) && project.stability == 'unstable'
+    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/)
@@ -191,7 +191,7 @@ class KCIBuilder
             system('git config --global user.email "kubuntu-ci at lists.launchpad.net"')
             system('git config --global user.name "Kubuntu CI"')
             system('git config core.sparsecheckout')
-            system('git checkout -f remotes/packaging/kubuntu_unstable')
+            system("git checkout -f remotes/packaging/kubuntu_#{project.stability}")
             system('git branch -a')
             system('git status')
             system('git reset --hard')

-- 
ci-tooling packaging