[lintian] 01/01: Move spelling-error-in-binary exceptions to a data file.
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit 2d71fba9ce02ccfaec3b7efc31ee8601ab9fe92e
Author: Chris Lamb <lamby@debian.org>
Date: Wed Jan 24 13:29:47 2018 +1100
Move spelling-error-in-binary exceptions to a data file.
---
checks/binaries.pm | 10 +++-------
data/binaries/spelling-exceptions | 9 +++++++++
debian/changelog | 1 +
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/checks/binaries.pm b/checks/binaries.pm
index b3b2775..2fe43ee 100644
--- a/checks/binaries.pm
+++ b/checks/binaries.pm
@@ -48,6 +48,8 @@ my $ARCH_REGEX = Lintian::Data->new('binaries/arch-regex', qr/\s*\~\~/o,
sub { return qr/$_[1]/ });
my $ARCH_64BIT_EQUIVS
= Lintian::Data->new('binaries/arch-64bit-equivs', qr/\s*\=\>\s*/);
+my $BINARY_SPELLING_EXCEPTIONS
+ = Lintian::Data->new('binaries/spelling-exceptions', qr/\s+/);
my %PATH_DIRECTORIES = map { $_ => 1 } qw(
bin/ sbin/ usr/bin/ usr/sbin/ usr/games/ );
@@ -386,13 +388,7 @@ sub run {
my $strings = slurp_entire_file($info->strings($file));
my $exceptions = {
%{ $group->info->spelling_exceptions },
- 'teH' => 1, # From #711207
- 'tEH' => 1, # From #782902
- 'tEh' => 1, # From #782902, too
- 'ang' => 1, # The Go stdlib html/ package contains "ang;"
- 'writeN' => 1, # The Go stdlib text/tabwriter pkg contains "writeN"
- 'ot' => 1, # The Go stdlib runtime/ package contains "ot"
- 'cymK' => 1, # The Go runtime contains "cymK" (#888074)
+ map { $_ => 1} $BINARY_SPELLING_EXCEPTIONS->all
};
my $tag_emitter
= spelling_tag_emitter('spelling-error-in-binary', $file);
diff --git a/data/binaries/spelling-exceptions b/data/binaries/spelling-exceptions
new file mode 100644
index 0000000..f5e7e2f
--- /dev/null
+++ b/data/binaries/spelling-exceptions
@@ -0,0 +1,9 @@
+# Set of exceptions that should be ingored for spelling-error-in-binary
+
+teH # From #711207
+tEH # From #782902
+tEh # From #782902, too
+ang # The Go stdlib html/ package contains "ang;"
+writeN # The Go stdlib text/tabwriter pkg contains "writeN"
+ot # The Go stdlib runtime/ package contains "ot"
+cymK # The Go runtime contains "cymK" (#888074)
diff --git a/debian/changelog b/debian/changelog
index 877826a..4c1480d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ lintian (2.5.72) UNRELEASED; urgency=medium
+ [CL] Avoid a false positive for spelling-error-in-binary that was
causing a FTBFS on armhf. (Closes: #888074)
+ [CL] Drop a duplicate line in spelling-error-in-binary exceptions.
+ + [CL] Move spelling-error-in-binary exceptions to a data file.
* checks/cruft.{desc,pm}:
+ [CL] Do not emit "license-problem-php-license" when the source comes
from pecl.php.net: "The last agreement with FTP Masters was that PHP
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: