[lintian] 01/01: Avoid warning for init.d-script-not-marked-as-conffile when the init.d script does not exist; we will already be alerted via he init.d-script-not-included-in-package error.
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit ac0b77bd9f59065b68f56e7c218ef7f3f082e2a3
Author: Chris Lamb <lamby@debian.org>
Date: Tue Oct 3 18:37:55 2017 +0100
Avoid warning for init.d-script-not-marked-as-conffile when the init.d script does not exist; we will already be alerted via he init.d-script-not-included-in-package error.
---
checks/init.d.pm | 18 +++++++++---------
debian/changelog | 4 ++++
t/tests/legacy-maintainer-scripts/desc | 3 ++-
t/tests/legacy-maintainer-scripts/tags | 1 -
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/checks/init.d.pm b/checks/init.d.pm
index a0f0aff..f85a276 100644
--- a/checks/init.d.pm
+++ b/checks/init.d.pm
@@ -173,15 +173,6 @@ sub run {
$initd_path = $initd_dir->child($initd_file)
if $initd_dir;
- if (
- not $initd_path
- or ( not $info->is_conffile($initd_path->name)
- and not $initd_path->is_symlink)
- ) {
- tag 'init.d-script-not-marked-as-conffile',
- "etc/init.d/$initd_file";
- }
-
# init.d scripts have to be marked as conffiles unless they're
# symlinks.
if (not $initd_path or not $initd_path->resolve_path) {
@@ -196,6 +187,15 @@ sub run {
next;
}
+ if (
+ not $initd_path
+ or ( not $info->is_conffile($initd_path->name)
+ and not $initd_path->is_symlink)
+ ) {
+ tag 'init.d-script-not-marked-as-conffile',
+ "etc/init.d/$initd_file";
+ }
+
# Check if file exists in package and check the script for
# other issues if it was included in the package.
check_init($initd_path, $info);
diff --git a/debian/changelog b/debian/changelog
index 3f8ac14..deef5f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ lintian (2.5.55) UNRELEASED; urgency=medium
to simplify some code paths. Nothing ships manpages in these
directories and lintian emits tags to strongly discourage people
from doing so.
+ * checks/init.d.pm:
+ + [CL] Avoid warning for init.d-script-not-marked-as-conffile when
+ the init.d script does not exist; we will already be alerted via
+ the init.d-script-not-included-in-package error.
* checks/python.pm:
+ [CL] Move to "Type: source, binary" check type.
+ [CL] Also match packages named "python2-*" as relating to Python 2.x.
diff --git a/t/tests/legacy-maintainer-scripts/desc b/t/tests/legacy-maintainer-scripts/desc
index 75ad965..a1548d5 100644
--- a/t/tests/legacy-maintainer-scripts/desc
+++ b/t/tests/legacy-maintainer-scripts/desc
@@ -20,7 +20,6 @@ Test-For:
dm-upload-allowed-is-obsolete
forbidden-config-interpreter
init.d-script-not-included-in-package
- init.d-script-not-marked-as-conffile
install-info-used-in-maintainer-script
maintainer-script-calls-init-script-directly
maintainer-script-empty
@@ -60,3 +59,5 @@ Test-For:
read-in-maintainer-script
uses-implicit-await-trigger
wrong-debian-qa-group-name
+Test-Against:
+ init.d-script-not-marked-as-conffile
diff --git a/t/tests/legacy-maintainer-scripts/tags b/t/tests/legacy-maintainer-scripts/tags
index ff85e2b..c461abe 100644
--- a/t/tests/legacy-maintainer-scripts/tags
+++ b/t/tests/legacy-maintainer-scripts/tags
@@ -55,7 +55,6 @@ W: maintainer-scripts source: qa-upload-has-incorrect-version-number 7+dfsg-0.1
W: maintainer-scripts: command-with-path-in-maintainer-script postinst:171 /usr/bin/baz
W: maintainer-scripts: command-with-path-in-maintainer-script preinst:12 /bin/egrep
W: maintainer-scripts: config-does-not-load-confmodule
-W: maintainer-scripts: init.d-script-not-marked-as-conffile etc/init.d/foo
W: maintainer-scripts: maintainer-script-empty config
W: maintainer-scripts: maintainer-script-ignores-errors postrm
W: maintainer-scripts: maintainer-script-ignores-errors preinst
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: