[SCM] ci-tooling packaging branch, master, updated. 5c7d8677795e94cc09523692d41a7a7bb442f044
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Wed Apr 8 15:36:48 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=5c7d867
The following commit has been merged in the master branch:
commit 5c7d8677795e94cc09523692d41a7a7bb442f044
Author: Harald Sitter <sitter at kde.org>
Date: Wed Apr 8 17:36:17 2015 +0200
use new linty tech in builder.rb, possibly blowing it up again
---
kci/builder.rb | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/kci/builder.rb b/kci/builder.rb
index 422f1ad..8a0de48 100755
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -8,6 +8,8 @@ require 'timeout'
require_relative 'lib/ci/build_version'
require_relative 'lib/debian/changelog'
require_relative 'lib/cmake_parser'
+require_relative 'lib/lint/control'
+require_relative 'lib/lint/result'
=begin
-> build_source
@@ -216,7 +218,8 @@ def segmentify(data, start_marker, end_marker)
end
def puts_kci(type, str)
- puts "KCI-#{type} :: #{str}"
+ warn 'Compatibility function builder#puts_kci called; use Lint instead'
+ Lint::ResultLogger.puts_kci(type, str)
end
def puts_error(str)
@@ -379,6 +382,12 @@ puts_cmake(log_data, source_name)
puts_list_missing(log_data)
puts_lintian(log_data, updated_symbols: updated_symbols)
+# Lint control file
+results = []
+results << Lint::Control.new('packaging').lint
+
+Lint::ResultLogger.new(results).log
+
# TODO: this script currently does not impact the build results nor does it
# create parsable output
qmlsrcs = %w(
--
ci-tooling packaging
More information about the pkg-kde-commits
mailing list