[SCM] Debian package checker branch, master, updated. 2.3.0-8-g136d3c9
The following commit has been merged in the master branch:
commit 45dd2744d754c06c1d6444a1f2d91158fe266490
Author: Raphael Geissert <atomo64@gmail.com>
Date: Sat Dec 26 22:55:00 2009 -0600
Fix a init.d-script-possible-missing-stop FP when stopping on 2-5
The check code was accidentally inserting information about runlevels
2-5 in the %stop hash which could later lead to a false positive.
diff --git a/checks/init.d b/checks/init.d
index ff6d230..b4220f2 100644
--- a/checks/init.d
+++ b/checks/init.d
@@ -290,7 +290,7 @@ sub check_init {
my %stop;
for my $runlevel (split (/\s+/, $lsb{'default-stop'})) {
if ($runlevel =~ /^[sS0-6]$/) {
- $stop{$runlevel} = 1 unless $runlevel =~ /[sS]/;
+ $stop{$runlevel} = 1 unless $runlevel =~ /[sS2-5]/;
if ($start{$runlevel}) {
tag "init.d-script-has-conflicting-start-stop", "/etc/init.d/$_ $runlevel";
}
diff --git a/t/tests/init.d-lsb-headers/debian/debian/control.in b/t/tests/init.d-lsb-headers/debian/debian/control.in
index 0aec17c..d8becea 100644
--- a/t/tests/init.d-lsb-headers/debian/debian/control.in
+++ b/t/tests/init.d-lsb-headers/debian/debian/control.in
@@ -29,6 +29,14 @@ Description: {$description} -- using /usr files
by Lintian. It is part of the Lintian test suite and may do very odd
things. It should not be installed like a regular package.
+Package: {$srcpkg}-length
+Architecture: {$architecture}
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: {$description} -- breaking length assumptions
+ Test package designed to exercise the checking of init
+ scripts by Lintian. It is part of the Lintian test suite and may do
+ very odd things. It should not be installed like a regular package.
+
Package: {$srcpkg}-local
Architecture: {$architecture}
Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
diff --git a/t/tests/init.d-general/debian/debian/init.d-general.init b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-length.init
similarity index 79%
copy from t/tests/init.d-general/debian/debian/init.d-general.init
copy to t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-length.init
index 97ef8f1..5ef97d7 100644
--- a/t/tests/init.d-general/debian/debian/init.d-general.init
+++ b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-length.init
@@ -3,11 +3,11 @@
set -e
### BEGIN INIT INFO
-# Provides: init.d-general
+# Provides: init.d-lsb-headers-length
# Required-Start:
# Required-Stop:
# Default-Start:
-# Default-Stop:
+# Default-Stop: 0 1 2 6
# Short-Description: Do nothing at all
### END INIT INFO
--
Debian package checker
Reply to: