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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit b623c793010d6c755fa479f01b776c11fe6fb451
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Dec 7 12:10:06 2015 +0100

    improve style of cmake log linter a tad
---
 lib/lint/log/cmake.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/lint/log/cmake.rb b/lib/lint/log/cmake.rb
index 3a28221..29f5ce3 100644
--- a/lib/lint/log/cmake.rb
+++ b/lib/lint/log/cmake.rb
@@ -78,18 +78,20 @@ module Lint
         [match[1]]
       end
 
+      # This possibly should be outsourced into files somehow?
       def parse_warning(line, _data)
         warn 'CMake Warning Parsing is disabled at this time!'
         return [] unless line.include?('CMake Warning')
         # Lines coming from MacroOptionalFindPackage (from old parsing).
-        return [] if line.include?('CMake Warning at /usr/share/kde4/apps/cmake/' \
-        'modules/MacroOptionalFindPackage.cmake')
+        return [] if line.include?('CMake Warning at ' \
+          '/usr/share/kde4/apps/cmake/modules/MacroOptionalFindPackage.cmake')
         # Lines coming from find_package (from old parsing).
         return [] if line.match(/CMake Warning at [^ :]+:\d+ \(find_package\)/)
-        # Lines coming from warnings inside the actual CMakeLists.txt as those can
-        # be arbitrary.
+        # Lines coming from warnings inside the actual CMakeLists.txt as those
+        # can be arbitrary.
         # ref: "CMake Warning at src/worker/CMakeLists.txt:33 (message):"
-        return [] if line.match(/CMake Warning at [^ :]*CMakeLists.txt:\d+ \(message\)/)
+        warning_exp = /CMake Warning at [^ :]*CMakeLists.txt:\d+ \(message\)/
+        return [] if line.match(warning_exp)
         return [] if line.start_with?('CMake Warning (dev)')
         [] # if line.start_with?('CMake Warning:')] ALWAYS empty, too pointless
       end

-- 
ci-tooling packaging