[lintian] 01/02: checks/apache2.pm: Include the offending filename and line number in the output of apache2-deprecated-auth-config and apache2-unparsable-dependency.
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit b07f918799fa97379d912e41241cabf18ace973f
Author: Chris Lamb <lamby@debian.org>
Date: Sat Dec 30 22:23:58 2017 +0000
checks/apache2.pm: Include the offending filename and line number in the output of apache2-deprecated-auth-config and apache2-unparsable-dependency.
---
checks/apache2.pm | 4 ++--
debian/changelog | 3 +++
t/tests/apache2-webapplications-general/tags | 16 ++++++++--------
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/checks/apache2.pm b/checks/apache2.pm
index f7410a7..d14e779 100644
--- a/checks/apache2.pm
+++ b/checks/apache2.pm
@@ -229,7 +229,7 @@ sub inspect_conf_file {
for my $directive ('Order', 'Satisfy', 'Allow', 'Deny',
qr{</?Limit.*?>}xsm, qr{</?LimitExcept.*?>}xsm) {
if (m{\A \s* ($directive) (?:\s+|\Z)}xsm) {
- tag 'apache2-deprecated-auth-config', $1;
+ tag 'apache2-deprecated-auth-config', $file, "(line $.)", $1;
}
}
@@ -239,7 +239,7 @@ sub inspect_conf_file {
if $field eq 'Conflicts' and $conftype ne 'mods';
my @dependencies = split(/[\n\s]+/, $value);
foreach my $dep (@dependencies) {
- tag 'apache2-unparsable-dependency', $file, $dep
+ tag 'apache2-unparsable-dependency', $file, "(line $.)", $dep
if $dep =~ m/[^\w\.]/
or $dep =~ /^mod\_/
or $dep =~ m/\.(?:conf|load)/;
diff --git a/debian/changelog b/debian/changelog
index c04bab5..6d63866 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ lintian (2.5.67) UNRELEASED; urgency=medium
XXX: generate tag summary
+ * checks/apache2.pm:
+ + [CL] Include the offending filename and line number in the output of
+ apache2-deprecated-auth-config and apache2-unparsable-dependency.
* checks/changelog-file.{desc,pm}:
+ [CL] Warn about changelog entries that have incorrectly formatted
dates. (Closes: #793406)
diff --git a/t/tests/apache2-webapplications-general/tags b/t/tests/apache2-webapplications-general/tags
index 3f2bb1c..58a32e3 100644
--- a/t/tests/apache2-webapplications-general/tags
+++ b/t/tests/apache2-webapplications-general/tags
@@ -1,21 +1,21 @@
E: phpmyfoo2: apache2-configuration-files-need-conf-suffix etc/apache2/conf-available/phpmyfoo2
W: phpmyfoo2: non-standard-apache2-configuration-name local-phpmyfoo2.conf != phpmyfoo2.conf
W: phpmyfoo2: non-standard-apache2-configuration-name phpmyfoo2 != phpmyfoo2.conf
-W: phpmyfoo3: apache2-deprecated-auth-config </Limit>
-W: phpmyfoo3: apache2-deprecated-auth-config <Limit POST PUT DELETE>
-W: phpmyfoo3: apache2-deprecated-auth-config Order
+W: phpmyfoo3: apache2-deprecated-auth-config etc/apache2/conf.d/phpmyfoo.conf (line 11) </Limit>
+W: phpmyfoo3: apache2-deprecated-auth-config etc/apache2/conf.d/phpmyfoo.conf (line 8) <Limit POST PUT DELETE>
+W: phpmyfoo3: apache2-deprecated-auth-config etc/apache2/conf.d/phpmyfoo.conf (line 9) Order
W: phpmyfoo3: apache2-reverse-dependency-uses-obsolete-directory etc/apache2/conf.d/phpmyfoo.conf
-W: phpmyfoo3: apache2-unparsable-dependency etc/apache2/conf.d/phpmyfoo.conf bar2.conf
+W: phpmyfoo3: apache2-unparsable-dependency etc/apache2/conf.d/phpmyfoo.conf (line 1) bar2.conf
W: phpmyfoo3: apache2-unsupported-dependency etc/apache2/conf.d/phpmyfoo.conf Conflicts
W: phpmyfoo3: non-standard-apache2-configuration-name phpmyfoo.conf != phpmyfoo3.conf
-W: phpmyfoo: apache2-deprecated-auth-config </Limit>
-W: phpmyfoo: apache2-deprecated-auth-config <Limit POST PUT DELETE>
-W: phpmyfoo: apache2-deprecated-auth-config Order
+W: phpmyfoo: apache2-deprecated-auth-config etc/apache2/conf-available/phpmyfoo.conf (line 11) </Limit>
+W: phpmyfoo: apache2-deprecated-auth-config etc/apache2/conf-available/phpmyfoo.conf (line 8) <Limit POST PUT DELETE>
+W: phpmyfoo: apache2-deprecated-auth-config etc/apache2/conf-available/phpmyfoo.conf (line 9) Order
W: phpmyfoo: apache2-reverse-dependency-calls-invoke-rc.d postinst
W: phpmyfoo: apache2-reverse-dependency-calls-invoke-rc.d postrm
W: phpmyfoo: apache2-reverse-dependency-calls-wrapper-script postinst a2enconf
W: phpmyfoo: apache2-reverse-dependency-calls-wrapper-script postrm a2disconf
-W: phpmyfoo: apache2-unparsable-dependency etc/apache2/conf-available/phpmyfoo.conf bar2.conf
+W: phpmyfoo: apache2-unparsable-dependency etc/apache2/conf-available/phpmyfoo.conf (line 1) bar2.conf
W: phpmyfoo: apache2-unsupported-dependency etc/apache2/conf-available/phpmyfoo.conf Conflicts
W: phpmyfoo: web-application-depends-on-apache2-data-package apache2-bin
W: phpmyfoo: web-application-should-not-depend-unconditionally-on-apache2
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: