[lintian] 01/02: checks/rules.pm: Refactor check for override_dh_clean-does-not-call-dh_clean tag into a loop.
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit fb55e5afcec4456ca4d9077ccff7d56097d0dd74
Author: Chris Lamb <lamby@debian.org>
Date: Sun Dec 31 08:46:31 2017 +0000
checks/rules.pm: Refactor check for override_dh_clean-does-not-call-dh_clean tag into a loop.
---
checks/rules.pm | 13 ++++++-------
debian/changelog | 2 ++
.../desc | 5 -----
t/tests/rules-override-dh-clean-does-not-call-dh-clean/desc | 5 -----
t/tests/rules-override-dh-clean-does-not-call-dh-clean/tags | 1 -
.../debian/debian/rules | 0
.../rules-override-dh-foo-does-not-call-dh-foo-unrel/desc | 5 +++++
.../tags | 0
.../debian/debian/rules | 2 +-
t/tests/rules-override-dh-foo-does-not-call-dh-foo/desc | 5 +++++
t/tests/rules-override-dh-foo-does-not-call-dh-foo/tags | 1 +
11 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/checks/rules.pm b/checks/rules.pm
index 375fcc8..9c81a20 100644
--- a/checks/rules.pm
+++ b/checks/rules.pm
@@ -426,13 +426,12 @@ sub run {
tag 'binary-arch-rules-but-pkg-is-arch-indep' if $nonempty;
}
- if (
- $overridden{'dh_clean'}
- and none { m/^\t\s*-?dh_clean\b/ }
- @{$rules_per_target{'override_dh_clean'}}
- ) {
- my $line = $overridden{'dh_clean'};
- tag 'override_dh_clean-does-not-call-dh_clean', "(line $line)";
+ foreach my $suffix (qw(dh_clean)) {
+ my $line = $overridden{$suffix};
+ tag "override_$suffix-does-not-call-$suffix", "(line $line)"
+ if $line
+ and none { m/^\t\s*-?$suffix\b/ }
+ @{$rules_per_target{"override_$suffix"}};
}
# Make sure that all the required build dependencies are there. Don't
diff --git a/debian/changelog b/debian/changelog
index 61c5cf7..00b9a40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,8 @@ lintian (2.5.67) UNRELEASED; urgency=medium
that use DH_EXTRA_ADDONS. Thanks! (Closes: #885790)
+ [CL] Update $PYTHON3X_DEPEND to prevent false positives in
missing-python-build-dependency. (Closes: #750537)
+ + [CL] Refactor check for override_dh_clean-does-not-call-dh_clean
+ tag into a loop.
* checks/scripts.pm:
+ [CL] Include the offending/unknown shebang in the output of various
interpreter-relateed tags. (Closes: #673734)
diff --git a/t/tests/rules-override-dh-clean-does-not-call-dh-clean-unrel/desc b/t/tests/rules-override-dh-clean-does-not-call-dh-clean-unrel/desc
deleted file mode 100644
index b89e55e..0000000
--- a/t/tests/rules-override-dh-clean-does-not-call-dh-clean-unrel/desc
+++ /dev/null
@@ -1,5 +0,0 @@
-Testname: rules-override-dh-clean-does-not-call-dh-clean-unrel
-Version: 1.0
-Description: Test for missing calls to dh_clean in override_dh_clean (false positive)
-Test-Against:
- override_dh_clean-does-not-call-dh_clean
diff --git a/t/tests/rules-override-dh-clean-does-not-call-dh-clean/desc b/t/tests/rules-override-dh-clean-does-not-call-dh-clean/desc
deleted file mode 100644
index 0900e2c..0000000
--- a/t/tests/rules-override-dh-clean-does-not-call-dh-clean/desc
+++ /dev/null
@@ -1,5 +0,0 @@
-Testname: rules-override-dh-clean-does-not-call-dh-clean
-Version: 1.0
-Description: Test for missing calls to dh_clean in override_dh_clean
-Test-For:
- override_dh_clean-does-not-call-dh_clean
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
deleted file mode 100644
index c597aba..0000000
--- a/t/tests/rules-override-dh-clean-does-not-call-dh-clean/tags
+++ /dev/null
@@ -1 +0,0 @@
-W: rules-override-dh-clean-does-not-call-dh-clean source: override_dh_clean-does-not-call-dh_clean (line 7)
diff --git a/t/tests/rules-override-dh-clean-does-not-call-dh-clean-unrel/debian/debian/rules b/t/tests/rules-override-dh-foo-does-not-call-dh-foo-unrel/debian/debian/rules
similarity index 100%
rename from t/tests/rules-override-dh-clean-does-not-call-dh-clean-unrel/debian/debian/rules
rename to t/tests/rules-override-dh-foo-does-not-call-dh-foo-unrel/debian/debian/rules
diff --git a/t/tests/rules-override-dh-foo-does-not-call-dh-foo-unrel/desc b/t/tests/rules-override-dh-foo-does-not-call-dh-foo-unrel/desc
new file mode 100644
index 0000000..c25a223
--- /dev/null
+++ b/t/tests/rules-override-dh-foo-does-not-call-dh-foo-unrel/desc
@@ -0,0 +1,5 @@
+Testname: rules-override-dh-foo-does-not-call-dh-foo-unrel
+Version: 1.0
+Description: Test for missing calls to dh_foo in override_dh_foo (false positives)
+Test-Against:
+ override_dh_clean-does-not-call-dh_clean
diff --git a/t/tests/rules-override-dh-clean-does-not-call-dh-clean-unrel/tags b/t/tests/rules-override-dh-foo-does-not-call-dh-foo-unrel/tags
similarity index 100%
rename from t/tests/rules-override-dh-clean-does-not-call-dh-clean-unrel/tags
rename to t/tests/rules-override-dh-foo-does-not-call-dh-foo-unrel/tags
diff --git a/t/tests/rules-override-dh-clean-does-not-call-dh-clean/debian/debian/rules b/t/tests/rules-override-dh-foo-does-not-call-dh-foo/debian/debian/rules
similarity index 75%
rename from t/tests/rules-override-dh-clean-does-not-call-dh-clean/debian/debian/rules
rename to t/tests/rules-override-dh-foo-does-not-call-dh-foo/debian/debian/rules
index b3cb63d..2b4af06 100755
--- a/t/tests/rules-override-dh-clean-does-not-call-dh-clean/debian/debian/rules
+++ b/t/tests/rules-override-dh-foo-does-not-call-dh-foo/debian/debian/rules
@@ -3,5 +3,5 @@
%:
dh $@
-# Empty target
+# Empty targets
override_dh_clean:
diff --git a/t/tests/rules-override-dh-foo-does-not-call-dh-foo/desc b/t/tests/rules-override-dh-foo-does-not-call-dh-foo/desc
new file mode 100644
index 0000000..0522ba6
--- /dev/null
+++ b/t/tests/rules-override-dh-foo-does-not-call-dh-foo/desc
@@ -0,0 +1,5 @@
+Testname: rules-override-dh-foo-does-not-call-dh-foo
+Version: 1.0
+Description: Test for missing calls to dh_foo in override_dh_foo
+Test-For:
+ override_dh_clean-does-not-call-dh_clean
diff --git a/t/tests/rules-override-dh-foo-does-not-call-dh-foo/tags b/t/tests/rules-override-dh-foo-does-not-call-dh-foo/tags
new file mode 100644
index 0000000..2e5195e
--- /dev/null
+++ b/t/tests/rules-override-dh-foo-does-not-call-dh-foo/tags
@@ -0,0 +1 @@
+W: rules-override-dh-foo-does-not-call-dh-foo 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: