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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit ec7b353ca1890a5cc22951b27070b7d178156cf0
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Aug 25 15:02:54 2015 +0200

    implement debian/patches/ignore override for missing patches in series
    
    https://community.kde.org/Kubuntu/CI/PatchesSeriesIgnore
---
 lib/lint/series.rb                                               | 9 ++++++++-
 .../{test_complete => test_ignore}/debian/patches/a.patch        | 0
 .../test_ignore/debian/patches/b.patch}                          | 0
 test/data/test_lint_series/test_ignore/debian/patches/ignore     | 1 +
 .../{test_missing => test_ignore}/debian/patches/series          | 0
 test/test_lint_series.rb                                         | 9 +++++++++
 6 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/lib/lint/series.rb b/lib/lint/series.rb
index 7ee9e81..2aa8696 100644
--- a/lib/lint/series.rb
+++ b/lib/lint/series.rb
@@ -9,6 +9,8 @@ require_relative 'result'
 module Lint
   # Lints a debian patches seris file
   class Series
+    EXCLUDES = %w(series ignore)
+
     attr_reader :package_directory
 
     def initialize(package_directory = Dir.pwd)
@@ -21,9 +23,10 @@ module Lint
     def lint
       result = Result.new.tap { |r| r.valid = true }
       Dir.glob("#{@patch_directory}/**/*").each do |patch|
-        next if File.basename(patch) == 'series'
+        next if EXCLUDES.include?(File.basename(patch))
         patch = relative(patch, @patch_directory)
         next if series.patches.include?(patch)
+        next if ignore.patches.include?(patch)
         result.warnings << "Patch #{File.basename(patch)} in VCS but not" \
                            ' listed in debian/series file.'
       end
@@ -39,5 +42,9 @@ module Lint
     def series
       @series ||= Debian::PatchSeries.new(@package_directory)
     end
+
+    def ignore
+      @ignore ||= Debian::PatchSeries.new(@package_directory, 'ignore')
+    end
   end
 end
diff --git a/test/data/test_lint_series/test_complete/debian/patches/a.patch b/test/data/test_lint_series/test_ignore/debian/patches/a.patch
similarity index 100%
copy from test/data/test_lint_series/test_complete/debian/patches/a.patch
copy to test/data/test_lint_series/test_ignore/debian/patches/a.patch
diff --git a/test/data/test_cmake_parser/test_init b/test/data/test_lint_series/test_ignore/debian/patches/b.patch
similarity index 100%
copy from test/data/test_cmake_parser/test_init
copy to test/data/test_lint_series/test_ignore/debian/patches/b.patch
diff --git a/test/data/test_lint_series/test_ignore/debian/patches/ignore b/test/data/test_lint_series/test_ignore/debian/patches/ignore
new file mode 100644
index 0000000..3dd3ba8
--- /dev/null
+++ b/test/data/test_lint_series/test_ignore/debian/patches/ignore
@@ -0,0 +1 @@
+b.patch 
diff --git a/test/data/test_lint_series/test_missing/debian/patches/series b/test/data/test_lint_series/test_ignore/debian/patches/series
similarity index 100%
copy from test/data/test_lint_series/test_missing/debian/patches/series
copy to test/data/test_lint_series/test_ignore/debian/patches/series
diff --git a/test/test_lint_series.rb b/test/test_lint_series.rb
index 0bae240..2a1ab94 100644
--- a/test/test_lint_series.rb
+++ b/test/test_lint_series.rb
@@ -25,4 +25,13 @@ class LintSeriesTest < TestCase
     assert_equal([], s.warnings)
     assert_equal([], s.informations)
   end
+
+  def test_ignore
+    # Has two missing but only one is reported as such.
+    s = Lint::Series.new(data).lint
+    assert(s.valid)
+    assert_equal([], s.errors)
+    assert_equal(1, s.warnings.size)
+    assert_equal([], s.informations)
+  end
 end

-- 
ci-tooling packaging