This is an automated email from the git hooks/post-receive script. lamby pushed a commit to branch master in repository lintian.
commit d16cd0f5a5c32c16c1802785a752a25f620ff818 Author: Chris Lamb <[email protected]> Date: Thu Jan 25 10:27:26 2018 +1100 Include the offending context and line when emitting the brace-expansion-in-debhelper-config-file tag. --- checks/debhelper.pm | 5 +++-- debian/changelog | 2 ++ t/tests/debhelper-brace-expansion/tags | 12 ++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/checks/debhelper.pm b/checks/debhelper.pm index d70f319..56ffb44 100644 --- a/checks/debhelper.pm +++ b/checks/debhelper.pm @@ -427,8 +427,9 @@ sub run { while (<$fd>) { next if /^\s*$/; next if (/^\#/ and $level >= 5); - if (m/(?<!\\)\{(?:[^\s\\\},]*?,)*[^\\\}\s,]+,*\}/) { - tag 'brace-expansion-in-debhelper-config-file',$file; + if (m/((?<!\\)\{(?:[^\s\\\},]*?,)*[^\\\}\s,]+,*\})/) { + tag 'brace-expansion-in-debhelper-config-file',$file, + $1,"(line $.)"; last; } } diff --git a/debian/changelog b/debian/changelog index 4c1480d..7366ce9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ lintian (2.5.72) UNRELEASED; urgency=medium + [CL] Warn about packages that use about dh_systemd_enable or dh_systemd_start overrides whilst using debhelper compat level 11 as they are no longer being called. (Closes: #887899) + + [CL] Include the offending context and line when emitting the + brace-expansion-in-debhelper-config-file tag. * checks/fields.pm: + [CL] Also check xfonts-foo for font-package-not-multi-arch-foreign. * checks/files.desc: diff --git a/t/tests/debhelper-brace-expansion/tags b/t/tests/debhelper-brace-expansion/tags index d1d55fe..18c247c 100644 --- a/t/tests/debhelper-brace-expansion/tags +++ b/t/tests/debhelper-brace-expansion/tags @@ -1,6 +1,6 @@ -W: debhelper-brace-expansion source: brace-expansion-in-debhelper-config-file debian/debhelper-brace-problem-1.install -W: debhelper-brace-expansion source: brace-expansion-in-debhelper-config-file debian/debhelper-brace-problem-2.install -W: debhelper-brace-expansion source: brace-expansion-in-debhelper-config-file debian/debhelper-brace-problem-3.install -W: debhelper-brace-expansion source: brace-expansion-in-debhelper-config-file debian/debhelper-brace-problem-4.install -W: debhelper-brace-expansion source: brace-expansion-in-debhelper-config-file debian/debhelper-brace-problem-5.install -W: debhelper-brace-expansion source: brace-expansion-in-debhelper-config-file debian/debhelper-brace-problem-6.install +W: debhelper-brace-expansion source: brace-expansion-in-debhelper-config-file debian/debhelper-brace-problem-1.install {,foo} (line 1) +W: debhelper-brace-expansion source: brace-expansion-in-debhelper-config-file debian/debhelper-brace-problem-2.install {foo,bar} (line 1) +W: debhelper-brace-expansion source: brace-expansion-in-debhelper-config-file debian/debhelper-brace-problem-3.install {foo,} (line 1) +W: debhelper-brace-expansion source: brace-expansion-in-debhelper-config-file debian/debhelper-brace-problem-4.install {,,foo} (line 1) +W: debhelper-brace-expansion source: brace-expansion-in-debhelper-config-file debian/debhelper-brace-problem-5.install {,foo,} (line 1) +W: debhelper-brace-expansion source: brace-expansion-in-debhelper-config-file debian/debhelper-brace-problem-6.install {foo} (line 1) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
