[lintian] 02/02: c/debhelper: Remove manual tag "folding"
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 2923b8e22a152e1645885ec4ea17f136c5df5c09
Author: Niels Thykier <niels@thykier.net>
Date: Sun Feb 14 22:36:57 2016 +0000
c/debhelper: Remove manual tag "folding"
The default output handles this case automatically now.
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/debhelper.pm | 15 +--------------
t/tests/debhelper-internal-files/tags | 3 ++-
2 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/checks/debhelper.pm b/checks/debhelper.pm
index 3ad929e..360a75a 100644
--- a/checks/debhelper.pm
+++ b/checks/debhelper.pm
@@ -283,7 +283,6 @@ sub run {
# Check the files in the debian directory for various debhelper-related
# things.
- my @indebfiles;
for my $file ($droot->children) {
next if not $file->is_symlink and not $file->is_file;
next if $file->name eq $drules->name;
@@ -325,7 +324,7 @@ sub run {
# The regex matches "debhelper", but debhelper/Dh_Lib does not
# make those, so skip it.
if ($basename ne 'debhelper') {
- push(@indebfiles, $basename);
+ tag 'temporary-debhelper-file', $basename;
}
} else {
my $base = $basename;
@@ -405,18 +404,6 @@ sub run {
tag $tagname, $level;
}
- if (scalar(@indebfiles)){
- my $f = shift(@indebfiles);
- my $others = scalar(@indebfiles);
- my $otext = '';
- if ($others > 1){
- $otext = " and $others others";
- } elsif($others == 1){
- $otext = ' and 1 other';
- }
- tag 'temporary-debhelper-file', "$f$otext";
- }
-
if ($seen_python_helper == -1 and $level >= 9) {
$seen_python_helper = 0;
}
diff --git a/t/tests/debhelper-internal-files/tags b/t/tests/debhelper-internal-files/tags
index ae4872e..1fbcd82 100644
--- a/t/tests/debhelper-internal-files/tags
+++ b/t/tests/debhelper-internal-files/tags
@@ -1 +1,2 @@
-E: debhelper-internal-files source: temporary-debhelper-file package.debhelper.log and 1 other
+E: debhelper-internal-files source: temporary-debhelper-file package.debhelper.log
+E: debhelper-internal-files source: temporary-debhelper-file package.postinst.debhelper
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: