[SCM] Debian package checker branch, master, updated. 2.5.3-198-g5984ee6
The following commit has been merged in the master branch:
commit 5984ee66f6435b7fe45cbd7f14d7c3a7dbd24bbf
Author: Peter Eisentraut <petere@debian.org>
Date: Fri Nov 4 23:41:56 2011 +0100
Add check for init.d status option
Acked-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/init.d b/checks/init.d
index 7fd52b4..f182bbe 100644
--- a/checks/init.d
+++ b/checks/init.d
@@ -282,7 +282,7 @@ sub check_init {
$needs_fs{'remote'} = 1 if ($l =~ m,^[^\#]*/usr/,);
$needs_fs{'local'} = 1 if ($l =~ m,^[^\#]*/var/,);
- while ($l =~ s/^[^\#]*?(start|stop|restart|force-reload)//o) {
+ while ($l =~ s/^[^\#]*?(start|stop|restart|force-reload|status)//o) {
$tag{$1} = 1;
}
}
@@ -433,6 +433,11 @@ sub check_init {
$tag{$option}
or tag 'init.d-script-does-not-implement-required-option', "etc/init.d/$_ $option";
}
+
+ for my $option qw(status) {
+ $tag{$option}
+ or tag 'init.d-script-does-not-implement-optional-option', "etc/init.d/$_ $option";
+ }
}
1;
diff --git a/checks/init.d.desc b/checks/init.d.desc
index 6870d3c..ab78829 100644
--- a/checks/init.d.desc
+++ b/checks/init.d.desc
@@ -75,6 +75,14 @@ Ref: policy 9.3.2
Info: The <tt>/etc/init.d</tt> scripts have to support the following
command line arguments: start, stop, restart, force-reload.
+Tag: init.d-script-does-not-implement-optional-option
+Severity: wishlist
+Certainty: certain
+Ref: http://wiki.debian.org/LSBInitScripts
+Info: The <tt>/etc/init.d</tt> script does not implement the status
+ option. This is not required by the Policy, but often requested by
+ users.
+
Tag: init.d-script-not-included-in-package
Severity: important
Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index f9c9f2c..7cb9919 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ lintian (2.5.4) UNRELEASED; urgency=low
* Summary of tag changes:
+ Added:
+ - init.d-script-does-not-implement-optional-option
- missing-build-dependency-for-dh-addon
- python-depends-but-no-python-helper
- python3-depends-but-no-python3-helper
@@ -51,6 +52,10 @@ lintian (2.5.4) UNRELEASED; urgency=low
+ [NT] Applied patch from Andrew Starr-Bochicchio to update the
description of font-in-non-font-package to better reflect current
font policy. (Closes: #646838)
+ * checks/init.d{,.desc}:
+ + [NT] Applied patch from Peter Eisentraut to detect init.d scripts
+ without support for the optional "status" option.
+ (Closes: #647250)
* checks/rules:
+ [JW] Fixed false negative "missing-build-dependency" when using
"dh --with=X" rather than "dh --with X". (Closes: #643714)
diff --git a/t/tests/init.d-general/debian/debian/init.d-general-interpreter-in-usr-dir.init b/t/tests/init.d-general/debian/debian/init.d-general-interpreter-in-usr-dir.init
index 9e873bb..88af15d 100644
--- a/t/tests/init.d-general/debian/debian/init.d-general-interpreter-in-usr-dir.init
+++ b/t/tests/init.d-general/debian/debian/init.d-general-interpreter-in-usr-dir.init
@@ -10,4 +10,4 @@
# Description: Enable service provided by daemon.
### END INIT INFO
-printf "start stop reload restart force-reload\n";
+printf "start status stop reload restart force-reload\n";
diff --git a/t/tests/init.d-general/desc b/t/tests/init.d-general/desc
index 1e4745f..110d285 100644
--- a/t/tests/init.d-general/desc
+++ b/t/tests/init.d-general/desc
@@ -3,6 +3,7 @@ Sequence: 6000
Version: 1.0
Description: Test tags related to the init.d checks
Test-For:
+ init.d-script-does-not-implement-optional-option
init.d-script-does-not-implement-required-option
init.d-script-sourcing-without-test
init.d-script-uses-usr-interpreter
diff --git a/t/tests/init.d-general/tags b/t/tests/init.d-general/tags
index bcd6a06..1aca5a2 100644
--- a/t/tests/init.d-general/tags
+++ b/t/tests/init.d-general/tags
@@ -3,4 +3,5 @@ E: init.d-general-bugs: init.d-script-does-not-implement-required-option etc/ini
E: init.d-general-bugs: init.d-script-does-not-implement-required-option etc/init.d/init.d-general-bugs start
E: init.d-general-bugs: init.d-script-does-not-implement-required-option etc/init.d/init.d-general-bugs stop
E: init.d-general-sourcing-without-test: init.d-script-sourcing-without-test etc/init.d/init.d-general-sourcing-without-test:15 /etc/default/rcS
+I: init.d-general-bugs: init.d-script-does-not-implement-optional-option etc/init.d/init.d-general-bugs status
W: init.d-general-interpreter-in-usr-dir: init.d-script-uses-usr-interpreter etc/init.d/init.d-general-interpreter-in-usr-dir /usr/bin/perl
diff --git a/t/tests/init.d-script-registration/debian/foo.in b/t/tests/init.d-script-registration/debian/foo.in
index 735d88e..15f5f8f 100644
--- a/t/tests/init.d-script-registration/debian/foo.in
+++ b/t/tests/init.d-script-registration/debian/foo.in
@@ -9,6 +9,8 @@ case "$1" in
;;
restart|force-reload)
;;
+ status)
+ ;;
*)
;;
esac
diff --git a/t/tests/scripts-calls-init-script/debian/self-invoke b/t/tests/scripts-calls-init-script/debian/self-invoke
index dfceee5..6eacfdd 100755
--- a/t/tests/scripts-calls-init-script/debian/self-invoke
+++ b/t/tests/scripts-calls-init-script/debian/self-invoke
@@ -18,6 +18,9 @@ case "$1" in
restart)
/etc/init.d/self-invoke start
;;
+ status)
+ :
+ ;;
force-reload)
:
;;
diff --git a/testset/tags.scripts b/testset/tags.scripts
index bd20efa..d7f1e81 100644
--- a/testset/tags.scripts
+++ b/testset/tags.scripts
@@ -24,6 +24,10 @@ I: scripts source: debian-watch-file-should-dversionmangle-not-uversionmangle li
I: scripts source: dpatch-missing-description 02_i_dont_have_a_description.patch
I: scripts source: dpatch-missing-description 04_i_dont_have_a_description_either.patch
I: scripts source: missing-debian-source-format
+I: scripts: init.d-script-does-not-implement-optional-option etc/init.d/lsb-broken status
+I: scripts: init.d-script-does-not-implement-optional-option etc/init.d/lsb-other status
+I: scripts: init.d-script-does-not-implement-optional-option etc/init.d/no-lsb status
+I: scripts: init.d-script-does-not-implement-optional-option etc/init.d/skeleton status
I: scripts: init.d-script-does-not-provide-itself etc/init.d/lsb-broken
I: scripts: init.d-script-missing-lsb-short-description etc/init.d/lsb-other
I: scripts: no-md5sums-control-file
--
Debian package checker
Reply to: