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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit ef58f057acb1e15d4449772af7d5784df01a599c
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Oct 12 13:03:32 2015 +0200

    do not read nonexistant files
---
 lib/lint/linter.rb       | 1 +
 test/test_kci_builder.rb | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/lib/lint/linter.rb b/lib/lint/linter.rb
index 33dcfef..849b457 100644
--- a/lib/lint/linter.rb
+++ b/lib/lint/linter.rb
@@ -10,6 +10,7 @@ module Lint
     end
 
     def load_include_ignores(file_path)
+      return unless File.exist?(file_path)
       File.read(file_path).strip.split($/).each do |line|
         next if line.strip.start_with?('#') || line.empty?
         @ignores << CI::IncludePattern.new(line)
diff --git a/test/test_kci_builder.rb b/test/test_kci_builder.rb
index 924e133..1d89c94 100644
--- a/test/test_kci_builder.rb
+++ b/test/test_kci_builder.rb
@@ -154,4 +154,8 @@ class KCIBuilderTest < TestCase
       end
     end
   end
+
+  def test_lint_cmake_no_ignore
+    KCIBuilder.lint_cmake('')
+  end
 end

-- 
ci-tooling packaging