This is an automated email from the git hooks/post-receive script. lamby pushed a commit to branch master in repository lintian.
commit 944533a7bce3389f2c39d5984a2116a9ebfb7d10 Author: Chris Lamb <[email protected]> Date: Thu Jan 25 21:11:06 2018 +1100 Avoid false positives and remove an existing (incorrect) test for apparent brace expansions in config files that do not include a comma. (Closes: #888304) --- checks/debhelper.pm | 2 +- debian/changelog | 3 +++ .../debian/debian/debhelper-brace-problem-6.install | 1 - .../debian/debian/debhelper-brace-problem-good.install | 3 +++ t/tests/debhelper-brace-expansion/tags | 1 - 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/checks/debhelper.pm b/checks/debhelper.pm index 56ffb44..6331fff 100644 --- a/checks/debhelper.pm +++ b/checks/debhelper.pm @@ -427,7 +427,7 @@ sub run { while (<$fd>) { next if /^\s*$/; next if (/^\#/ and $level >= 5); - if (m/((?<!\\)\{(?:[^\s\\\},]*?,)*[^\\\}\s,]+,*\})/) { + if (m/((?<!\\)\{(?:[^\s\\\}]*?,)+[^\\\}\s,]*,*\})/) { tag 'brace-expansion-in-debhelper-config-file',$file, $1,"(line $.)"; last; diff --git a/debian/changelog b/debian/changelog index 76594f8..e29b85e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,9 @@ lintian (2.5.72) UNRELEASED; urgency=medium 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. + + [CL] Avoid false positives and remove an existing (incorrect) test + for apparent brace expansions in config files that do not include a + comma. (Closes: #888304) * 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/debian/debian/debhelper-brace-problem-6.install b/t/tests/debhelper-brace-expansion/debian/debian/debhelper-brace-problem-6.install deleted file mode 100644 index 79dd5dc..0000000 --- a/t/tests/debhelper-brace-expansion/debian/debian/debhelper-brace-problem-6.install +++ /dev/null @@ -1 +0,0 @@ -{foo}.txt usr/share/debhelper diff --git a/t/tests/debhelper-brace-expansion/debian/debian/debhelper-brace-problem-good.install b/t/tests/debhelper-brace-expansion/debian/debian/debhelper-brace-problem-good.install index 7b81943..002c07b 100644 --- a/t/tests/debhelper-brace-expansion/debian/debian/debhelper-brace-problem-good.install +++ b/t/tests/debhelper-brace-expansion/debian/debian/debhelper-brace-problem-good.install @@ -1,2 +1,5 @@ \{.txt usr/share/debhelper \{good\}.txt usr/share/debhelper +{}.txt usr/share/debhelper +{foo} usr/share/debhelper +{foo}.txt usr/share/debhelper diff --git a/t/tests/debhelper-brace-expansion/tags b/t/tests/debhelper-brace-expansion/tags index 18c247c..d9488a8 100644 --- a/t/tests/debhelper-brace-expansion/tags +++ b/t/tests/debhelper-brace-expansion/tags @@ -3,4 +3,3 @@ W: debhelper-brace-expansion source: brace-expansion-in-debhelper-config-file de 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
