[SCM] ci-tooling packaging branch, master, updated. 1057b74bf91a718f36ab197ae6eabb076ed20b90

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit c9dbeea5be770f9398f5d25fcb75919074896444
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Oct 6 13:55:35 2015 +0200

    refactor kcibuilder to use new source.build_version
---
 kci/builder.rb | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/kci/builder.rb b/kci/builder.rb
index 58a4f80..aee8b3d 100755
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -83,11 +83,6 @@ class KCIBuilder
       FileUtils.chown_R('jenkins', 'jenkins', @workspace_path, verbose: true)
     end unless testing
 
-    # version
-    changelog = Changelog.new('packaging')
-    version = CI::BuildVersion.new(changelog)
-    source_name = changelog.name
-
     source = VcsSourceBuilder.new(release: project.series).run
 
     # Mangle dsc to not do ARM builds unless explicitly enabled.
@@ -109,7 +104,7 @@ class KCIBuilder
       abort e
     end
 
-    fail CoverageError, 'Testing disabled after source building' if testing
+    fail CoverageError, 'Testing disabled after arch twiddle' if testing
 
     # Sign
     Dir.chdir('build/') do
@@ -199,8 +194,8 @@ class KCIBuilder
             system('git reset --hard')
             captures = match.captures
             captures.each do |lib_package|
-              puts "pkgkde-symbolshelper batchpatch -v #{version.base} -c #{architectures_with_log.join(',')} #{logs.join(' ')}"
-              system("pkgkde-symbolshelper batchpatch -v #{version.base} -c #{architectures_with_log.join(',')} #{logs.join(' ')}")
+              puts "pkgkde-symbolshelper batchpatch -v #{source.build_version.base} -c #{architectures_with_log.join(',')} #{logs.join(' ')}"
+              system("pkgkde-symbolshelper batchpatch -v #{source.build_version.base} -c #{architectures_with_log.join(',')} #{logs.join(' ')}")
               updated_symbols = ($? == 0)
               puts_info("Auto-updated symbols of #{lib_package}")
             end
@@ -219,7 +214,7 @@ class KCIBuilder
       end
     end
 
-    puts_cmake(log_data, source_name)
+    puts_cmake(log_data, source.name)
     puts_list_missing(log_data)
     puts_lintian(log_data, updated_symbols: updated_symbols)
 

-- 
ci-tooling packaging