[lintian] 01/01: Include the line number when warning about instances of override_dh_clean targets that are missing calls to dh_clean.
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit e524f2249dd640472d76eb0c01a3aa93e42ac143
Author: Chris Lamb <lamby@debian.org>
Date: Fri Dec 29 10:42:24 2017 +0000
Include the line number when warning about instances of override_dh_clean targets that are missing calls to dh_clean.
---
checks/rules.pm | 11 +++++++----
debian/changelog | 4 +++-
t/tests/rules-override-dh-clean-does-not-call-dh-clean/tags | 2 +-
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/checks/rules.pm b/checks/rules.pm
index 5c0754b..5e6a175 100644
--- a/checks/rules.pm
+++ b/checks/rules.pm
@@ -308,7 +308,7 @@ sub run {
qr/^$_$/;
} split(' ', $target_dependencies);
for my $target (@current_targets) {
- $overridden{$1}++ if $target =~ m/override_(.+)/;
+ $overridden{$1} = $. if $target =~ m/override_(.+)/;
if ($target =~ m/%/o) {
my $pattern = quotemeta $target;
$pattern =~ s/\\%/.*/g;
@@ -426,11 +426,14 @@ sub run {
tag 'binary-arch-rules-but-pkg-is-arch-indep' if $nonempty;
}
- tag 'override_dh_clean-does-not-call-dh_clean'
- if (
+ if (
$overridden{'dh_clean'}
and none { m/^\t\s*-?dh_clean\b/ }
- @{$rules_per_target{'override_dh_clean'}});
+ @{$rules_per_target{'override_dh_clean'}}
+ ) {
+ my $line = $overridden{'dh_clean'};
+ tag 'override_dh_clean-does-not-call-dh_clean', "(line $line)";
+ }
# Make sure that all the required build dependencies are there. Don't
# issue missing-build-dependency errors for debhelper, since there's
diff --git a/debian/changelog b/debian/changelog
index c103ac3..2418928 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,11 +15,13 @@ lintian (2.5.67) UNRELEASED; urgency=medium
dependencies *from* packages with such names. (Closes: #885693)
+ [CL] Also ignore -common and -tools packages for intra-Python variant
dependency checking, python-foo-but-no-python3-foo, etc.
- * checks/rules.desc:
+ * checks/rules.{desc.pm}:
+ [CL] Suggest using /usr/share/dpkg/architecture.mk as a solution to
debian-rules-sets-dpkg-architecture-variable rather than simply
replacing assignments with ?=. Thanks to Helmut Grohne for the
suggestion.
+ + [CL] Include the line number when warning about instances of
+ override_dh_clean targets that are missing calls to dh_clean.
* checks/source-copyright.desc:
+ [CL] Also mention that we check for NOTICE.gz files when looking for
Apache 2.0 packages that do not distribute their accompanying NOTICE
diff --git a/t/tests/rules-override-dh-clean-does-not-call-dh-clean/tags b/t/tests/rules-override-dh-clean-does-not-call-dh-clean/tags
index 57015b2..c597aba 100644
--- a/t/tests/rules-override-dh-clean-does-not-call-dh-clean/tags
+++ b/t/tests/rules-override-dh-clean-does-not-call-dh-clean/tags
@@ -1 +1 @@
-W: rules-override-dh-clean-does-not-call-dh-clean source: override_dh_clean-does-not-call-dh_clean
+W: rules-override-dh-clean-does-not-call-dh-clean source: override_dh_clean-does-not-call-dh_clean (line 7)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: