This is an automated email from the git hooks/post-receive script. lamby pushed a commit to branch master in repository lintian.
commit ca3934004da8170468193c7d57bf17292a78c237 Author: Chris Lamb <la...@debian.org> Date: Thu Jan 4 09:09:11 2018 +0000 checks/cruft.pm: Avoid a false-positive reported by Theppitak Karoonboonyanan when matching autotools-pkg-config-macro-not-cross-compilation-safe by skipping comment lines. (Closes: #886297) --- checks/cruft.pm | 1 + debian/changelog | 4 ++++ .../debian/configure.ac | 2 ++ .../debian/configure.in | 2 ++ 4 files changed, 9 insertions(+) diff --git a/checks/cruft.pm b/checks/cruft.pm index 4d27b18..3007a68 100644 --- a/checks/cruft.pm +++ b/checks/cruft.pm @@ -683,6 +683,7 @@ sub find_cruft { && $entry->is_open_ok) { my $fd = $entry->open; while (my $line = <$fd>) { + next if $line =~ m{^\s*dnl}; tag 'autotools-pkg-config-macro-not-cross-compilation-safe', $name, "(line $.)" if $line=~ m{AC_PATH_PROG\s*\([^,]+,\s*\[?pkg-config\]?\s*,}; diff --git a/debian/changelog b/debian/changelog index 6aa540f..b7ab244 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ lintian (2.5.68) UNRELEASED; urgency=medium XXX: generate tag summary + * checks/cruft.pm: + + [CL] Avoid a false-positive reported by Theppitak Karoonboonyanan + when matching autotools-pkg-config-macro-not-cross-compilation-safe + by skipping comment lines. (Closes: #886297) * checks/scripts.desc: + [CL] Also mention Recommends and Suggests in the opening paragraph of python-script-but-no-python-dep. (Closes: #687141) diff --git a/t/tests/cruft-autotools-pkg-config-macro-not-cross-compilation-safe/debian/configure.ac b/t/tests/cruft-autotools-pkg-config-macro-not-cross-compilation-safe/debian/configure.ac index 0250f9b..5955b08 100644 --- a/t/tests/cruft-autotools-pkg-config-macro-not-cross-compilation-safe/debian/configure.ac +++ b/t/tests/cruft-autotools-pkg-config-macro-not-cross-compilation-safe/debian/configure.ac @@ -1 +1,3 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + +dnl AC_PATH_PROG(PKG_CONFIG, pkg-config, no) diff --git a/t/tests/cruft-autotools-pkg-config-macro-not-cross-compilation-safe/debian/configure.in b/t/tests/cruft-autotools-pkg-config-macro-not-cross-compilation-safe/debian/configure.in index eeb7274..abfcac8 100644 --- a/t/tests/cruft-autotools-pkg-config-macro-not-cross-compilation-safe/debian/configure.in +++ b/t/tests/cruft-autotools-pkg-config-macro-not-cross-compilation-safe/debian/configure.in @@ -1 +1,3 @@ AC_PATH_PROG(PKGCONFIG, pkg-config, no, $PATH:/usr/bin:/usr/local/bin) + + dnl AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git