[lintian] 01/01: c/binaries.pm: Update numpy matching
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit d4caf9a8d90c604a4344e744c0a09dd81d4534cd
Author: Niels Thykier <niels@thykier.net>
Date: Sun Jan 31 12:25:19 2016 +0000
c/binaries.pm: Update numpy matching
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/binaries.pm | 8 +++++---
debian/changelog | 2 ++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/checks/binaries.pm b/checks/binaries.pm
index 051d2ad..123c181 100644
--- a/checks/binaries.pm
+++ b/checks/binaries.pm
@@ -24,8 +24,10 @@ use strict;
use warnings;
use autodie;
-use constant NUMPY_STRING => 'module compiled against ABI version %x'
- . ' but this version of numpy is %x';
+use constant NUMPY_REGEX => qr/
+ \Qmodule compiled against ABI version \E (?:0x)?%x
+ \Q but this version of numpy is \E (?:0x)?%x
+/xo;
# These are the ones file(1) looks for. The ".zdebug_info" being the
# compressed version of .debug_info.
@@ -450,7 +452,7 @@ sub run {
or( $fname =~ m,usr/lib/python3/.+\.cpython-\d+([a-z]+)\.so$,
and $1 !~ /d/)
) {
- if (index($strings, NUMPY_STRING) != -1) {
+ if (index($strings, 'numpy') > -1 and $strings =~ NUMPY_REGEX) {
$uses_numpy_c_abi = 1;
}
}
diff --git a/debian/changelog b/debian/changelog
index 76cf517..85ad004 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ lintian (2.5.41) UNRELEASED; urgency=medium
XXX: generate tag summary
+ * checks/binaries.pm:
+ + [NT] Update match for detecting numpy linking.
* checks/cruft.{desc,pm}:
+ [BR] Filter some simple comments for long line in source-is-missing
(Closes: #798900).
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: