[SCM] ci-tooling packaging branch, master, updated. 2ede1de1e30291a5c9f4d1cb447bf8b86310c3b1
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Tue Mar 3 07:53:06 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=8144a90
The following commit has been merged in the master branch:
commit 8144a902148983a7226e2abe059efcfe48f9b0f9
Author: Harald Sitter <sitter at kde.org>
Date: Tue Mar 3 08:51:39 2015 +0100
fix format of puts_lintian
---
kci/builder.rb | 57 +++++++++++++++++++++++++++++----------------------------
1 file changed, 29 insertions(+), 28 deletions(-)
diff --git a/kci/builder.rb b/kci/builder.rb
index 7c9bcd5..edda175 100755
--- a/kci/builder.rb
+++ b/kci/builder.rb
@@ -317,36 +317,37 @@ def puts_list_missing(data)
end
def puts_lintian(data, args = {})
- data = segmentify(data, "=== Start lintian
", "=== End lintian
")
- return if data.empty?
- puts "KCI::LINTIAN"
- data.each do |line|
- next if line.start_with?('warning: ') # random warnings from lintian itself
-
- # Package names can easily go beyond what shit can suck on, so gag it.
- next if line.include?('source-package-component-has-long-file-name')
- next if line.include?('package-has-long-file-name')
-
- # We really do not care about standards versions for now. They only ever get
- # bumped by the pkg-kde team anyway.
- next if line.include?('out-of-date-standards-version')
- next if line.include?('newer-standards-version')
-
- # Do not print symbols warnings if we already auto-updated.
- if args[:updated_symbols] and line.include?('symbols-file-contains-current-version-with-debian-revision')
- next
- end
+ data = segmentify(data, "=== Start lintian
", "=== End lintian
")
+ return if data.empty?
+ puts 'KCI::LINTIAN'
+ data.each do |line|
+ next if line.start_with?('warning: ') # random warnings from lintian itself
+
+ # Package names can easily go beyond what shit can suck on, so gag it.
+ next if line.include?('source-package-component-has-long-file-name')
+ next if line.include?('package-has-long-file-name')
+
+ # We really do not care about standards versions for now. They only ever get
+ # bumped by the pkg-kde team anyway.
+ next if line.include?('out-of-date-standards-version')
+ next if line.include?('newer-standards-version')
+
+ # Do not print symbols warnings if we already auto-updated.
+ if args[:updated_symbols] &&
+ line.include?('symbols-file-contains-current-version-with-debian-revision')
+ next
+ end
- case line[0..1]
- when 'W:'
- puts_warning(line)
- next
- when 'E:'
- puts_error(line)
- next
- end
- puts_info(line)
+ case line[0..1]
+ when 'W:'
+ puts_warning(line)
+ next
+ when 'E:'
+ puts_error(line)
+ next
end
+ puts_info(line)
+ end
end
# We need discrete arrays of both logs and architectures they represent
--
ci-tooling packaging
More information about the pkg-kde-commits
mailing list