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

[lintian] 01/01: c/patch-systems: Do not merge multiple tags into one



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

nthykier pushed a commit to branch master
in repository lintian.

commit 55e95d9ece3a139fa07702bc8a7aa702bdce16a1
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Jun 19 16:22:02 2016 +0000

    c/patch-systems: Do not merge multiple tags into one
    
    Emit a tag for each directly patched file when there is a patch
    system, so each individual tag can be overridden in isolation.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>
---
 checks/patch-systems.pm | 7 +++++--
 debian/changelog        | 5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/checks/patch-systems.pm b/checks/patch-systems.pm
index bd27705..0433d76 100644
--- a/checks/patch-systems.pm
+++ b/checks/patch-systems.pm
@@ -236,8 +236,11 @@ sub run {
     if (@direct) {
         my $files= (@direct > 1) ? "$direct[0] and $#direct more" : $direct[0];
 
-        tag 'patch-system-but-direct-changes-in-diff', $files
-          if ($uses_patch_system);
+        if ($uses_patch_system) {
+            for my $patched_file (@direct) {
+                tag 'patch-system-but-direct-changes-in-diff', $patched_file;
+            }
+        }
         tag 'direct-changes-in-diff-but-no-patch-system', $files
           if (not $uses_patch_system);
     }
diff --git a/debian/changelog b/debian/changelog
index 20dbb34..d7abd45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,11 @@ lintian (2.5.45) UNRELEASED; urgency=medium
       Thanks to Vincent Bernat for the report.  (Closes: #825193)
   * checks/manpages.desc:
     + [NT] Use "gzip -9n" rather than "gzip -9" in examples.
+  * checks/patch-systems.pm:
+    + [NT] Emit a separate tag for each patched file instead of bundling
+      them all together.  This allows individual instances to be
+      overridden.  Thanks to Nathan Summers for the report.
+      (Closes: #541491)
   * checks/scripts.{desc,pm}:
     + [NT] Add tracking tag to trace auto-generated shell
       snippets in maintainer scripts.

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


Reply to: