[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 01/01: Check "$vendor.series" (not "series.$vendor") when checking for the patch-file-present-but-not-mentioned-in-series tag.



This is an automated email from the git hooks/post-receive script.

lamby pushed a commit to branch master
in repository lintian.

commit 5639a80c80a860ee2757af5570173ae3dee0c509
Author: Chris Lamb <lamby@debian.org>
Date:   Mon Jan 22 15:54:54 2018 +1100

    Check "$vendor.series" (not "series.$vendor") when checking for the patch-file-present-but-not-mentioned-in-series tag.
---
 checks/patch-systems.pm                                                 | 2 +-
 debian/changelog                                                        | 2 ++
 .../debian/debian/patches/{series.vendorname => vendorname.series}      | 0
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/checks/patch-systems.pm b/checks/patch-systems.pm
index c279f87..557e0b1 100644
--- a/checks/patch-systems.pm
+++ b/checks/patch-systems.pm
@@ -232,7 +232,7 @@ sub run {
     if ($dpdir and $format ne '2.0') {
         # Check all series filesf, including $vendor.series
         foreach my $file ($dpdir->children) {
-            next unless $file =~ /\/series(\..+)?$/;
+            next unless $file =~ /\/(.+\.)?series$/;
             next unless $file->is_open_ok;
             $known_files{$file->basename}++;
             my $fd = $file->open;
diff --git a/debian/changelog b/debian/changelog
index 6988aa3..8b455a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ lintian (2.5.72) UNRELEASED; urgency=medium
       packages for patch-file-present-but-not-mentioned-in-series.
     + [CL] Ignore commented-out patches in series files when checking the
       patch-file-present-but-not-mentioned-in-series tag.
+    + [CL] Check "$vendor.series" (not "series.$vendor") when checking for
+      the patch-file-present-but-not-mentioned-in-series tag.
 
  -- Chris Lamb <lamby@debian.org>  Sun, 21 Jan 2018 16:42:25 +1100
 
diff --git a/t/tests/patch-systems-quilt-general/debian/debian/patches/series.vendorname b/t/tests/patch-systems-quilt-general/debian/debian/patches/vendorname.series
similarity index 100%
rename from t/tests/patch-systems-quilt-general/debian/debian/patches/series.vendorname
rename to t/tests/patch-systems-quilt-general/debian/debian/patches/vendorname.series

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: