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

[lintian] 02/02: Also allow $(overridden_command) when checking for the override_dh_fixperms-does-not-call-dh_fixperms etc. tags.



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

lamby pushed a commit to branch master
in repository lintian.

commit 00a0a03d24906be595837ef84ac3564d6c978e23
Author: Chris Lamb <lamby@debian.org>
Date:   Tue Jan 2 16:17:12 2018 +0000

    Also allow $(overridden_command) when checking for the override_dh_fixperms-does-not-call-dh_fixperms etc. tags.
---
 checks/rules.pm                                                        | 2 +-
 debian/changelog                                                       | 3 +++
 .../debian/debian/rules                                                | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/checks/rules.pm b/checks/rules.pm
index cde90f4..6d8483a 100644
--- a/checks/rules.pm
+++ b/checks/rules.pm
@@ -430,7 +430,7 @@ sub run {
         my $line = $overridden{$cmd};
         tag "override_$cmd-does-not-call-$cmd", "(line $line)"
           if $line
-          and none { m/^\t\s*-?$cmd\b/ }
+          and none { m/^\t\s*-?($cmd\b|\$\(overridden_command\))/ }
         @{$rules_per_target{"override_$cmd"}};
     }
 
diff --git a/debian/changelog b/debian/changelog
index bd452c6..7cd2085 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ lintian (2.5.68) UNRELEASED; urgency=medium
   * checks/python.pm:
     + [CL] Don't warn about django-package-does-not-depend-on-django for
       -doc packages, etc.
+  * checks/rules.pm:
+    + [CL] Also allow $(overridden_command) when checking for the
+      override_dh_fixperms-does-not-call-dh_fixperms etc. tags.
 
   * data/files/fnames:
     + [CL] Warn about packages that ship (non-reproducible) Python
diff --git a/t/tests/rules-override-dh-foo-does-not-call-dh-foo-unrel/debian/debian/rules b/t/tests/rules-override-dh-foo-does-not-call-dh-foo-unrel/debian/debian/rules
index cfe2c82..871fb50 100755
--- a/t/tests/rules-override-dh-foo-does-not-call-dh-foo-unrel/debian/debian/rules
+++ b/t/tests/rules-override-dh-foo-does-not-call-dh-foo-unrel/debian/debian/rules
@@ -9,4 +9,4 @@ override_dh_clean:
 
 override_dh_fixperms:
 	true
-	dh_fixperms # This rule is a false positive
+	$(overridden_command) # This rule is a false positive

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


Reply to: