[SCM] Debian package checker branch, master, updated. 2.5.3-237-g3adb10c
The following commit has been merged in the master branch:
commit 3adb10caccbe135b491a2710c6b4d5789878923e
Author: Niels Thykier <niels@thykier.net>
Date: Sun Nov 20 21:52:56 2011 +0100
Added tag for missing LSB Description keyword
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/init.d b/checks/init.d
index 1cb0ec1..242a838 100644
--- a/checks/init.d
+++ b/checks/init.d
@@ -31,8 +31,11 @@ my %lsb_keywords = (provides => 1,
'should-stop' => 0,
'default-start' => 1,
'default-stop' => 1,
+ # These two are actually optional, but we mark
+ # them as required and give them a weaker tag if
+ # they are missing.
'short-description' => 1,
- 'description' => 0);
+ 'description' => 1);
# These init script names should probably not be used in dependencies.
# Instead, the corresponding virtual facility should be used.
@@ -296,6 +299,8 @@ sub check_init {
if ($lsb_keywords{$keyword} && !defined $lsb{$keyword}) {
if ($keyword eq 'short-description') {
tag 'init.d-script-missing-lsb-short-description', "etc/init.d/$_";
+ } elsif ($keyword eq 'description') {
+ tag 'init.d-script-missing-lsb-description', "etc/init.d/$_";
} else {
tag 'init.d-script-missing-lsb-keyword', "etc/init.d/$_ $keyword";
}
diff --git a/checks/init.d.desc b/checks/init.d.desc
index ab78829..18a1b87 100644
--- a/checks/init.d.desc
+++ b/checks/init.d.desc
@@ -187,6 +187,15 @@ Info: This <tt>/etc/init.d</tt> script has an LSB keyword section, but it
used currently, but adding it is still a good idea for documentation
purposes.
+Tag: init.d-script-missing-lsb-description
+Severity: wishlist
+Certainty: certain
+Ref: http://wiki.debian.org/LSBInitScripts
+Info: This <tt>/etc/init.d</tt> script has an LSB keyword section, but
+ it is missing a Description LSB keyword. This field isn't directly
+ used currently, but adding it is still a good idea for documentation
+ purposes.
+
Tag: init.d-script-has-bad-start-runlevel
Severity: normal
Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index 881939b..ca89318 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ lintian (2.5.4) UNRELEASED; urgency=low
- data.tar.xz-member-without-dpkg-pre-depends
- gzip-file-is-not-multi-arch-same-safe
- init.d-script-does-not-implement-optional-option
+ - init.d-script-missing-lsb-description
- missing-build-dependency-for-dh-addon
- package-depends-on-lower-priority-package
- package-would-benefit-from-build-arch-targets
@@ -94,6 +95,9 @@ lintian (2.5.4) UNRELEASED; urgency=low
(Closes: #647250)
+ [NT] Fixed deprecation warning when using perl 5.14.
(Closes: #649133)
+ + [NT] Added tag for missing LSB Description keyword. Thanks to
+ Michael Biebl and Petter Reinholdtsen for the bug report.
+ (Closes: #604620)
* checks/rules{,.desc}:
+ [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-bugs.init b/t/tests/init.d-general/debian/debian/init.d-general-bugs.init
index a5804aa..ea68340 100644
--- a/t/tests/init.d-general/debian/debian/init.d-general-bugs.init
+++ b/t/tests/init.d-general/debian/debian/init.d-general-bugs.init
@@ -9,6 +9,7 @@ set -e
# Default-Start:
# Default-Stop:
# Short-Description: Do nothing at all
+# Description: The short description pretty much covers it.
### END INIT INFO
# start stop force-reload restart status
diff --git a/t/tests/init.d-general/debian/debian/init.d-general.init b/t/tests/init.d-general/debian/debian/init.d-general.init
index 97ef8f1..539acb9 100644
--- a/t/tests/init.d-general/debian/debian/init.d-general.init
+++ b/t/tests/init.d-general/debian/debian/init.d-general.init
@@ -9,6 +9,7 @@ set -e
# Default-Start:
# Default-Stop:
# Short-Description: Do nothing at all
+# Description: The short description pretty much covers it.
### END INIT INFO
case "$1" in
diff --git a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-length.init b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-length.init
index 5ef97d7..3edd94f 100644
--- a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-length.init
+++ b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-length.init
@@ -9,6 +9,7 @@ set -e
# Default-Start:
# Default-Stop: 0 1 2 6
# Short-Description: Do nothing at all
+# Description: The short description pretty much covers it.
### END INIT INFO
case "$1" in
diff --git a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-local.init b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-local.init
index c9b1074..93218d5 100644
--- a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-local.init
+++ b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-local.init
@@ -9,6 +9,7 @@ set -e
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Do nothing at all
+# Description: The short description pretty much covers it.
### END INIT INFO
exec >/var/log/foo.log
diff --git a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-missing.init b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-missing.init
index bacd32f..c315953 100644
--- a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-missing.init
+++ b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-missing.init
@@ -8,7 +8,6 @@ set -e
# Required-Stop:
# Default-Start: 2 3 5
# Default-Stop: 0 6
-# Short-Description: Just a test script
### END INIT INFO
. /lib/init/vars.sh
diff --git a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-parsing.init b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-parsing.init
index e7e4286..e3f518f 100644
--- a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-parsing.init
+++ b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-parsing.init
@@ -9,6 +9,7 @@ set -e
# Default-Start: 0
# Default-Stop: 0
# Short-Description: Do nothing at all
+# Description: The short description pretty much covers it.
### END INIT INFO
case "$1" in
diff --git a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-remote.init b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-remote.init
index 17de3c0..475db5a 100644
--- a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-remote.init
+++ b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-remote.init
@@ -10,6 +10,7 @@ set -e
# Default-Start: 2 3 4 5
# Default-Stop:
# Short-Description: Do nothing at all
+# Description: The short description pretty much covers it.
### END INIT INFO
. /usr/share/foo/lib.sh
diff --git a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-virtual.init b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-virtual.init
index ebec837..032163c 100644
--- a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-virtual.init
+++ b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-virtual.init
@@ -10,6 +10,7 @@ set -e
# Default-Start: 2 3 4 5
# Default-Stop:
# Short-Description: Just a test script
+# Description: The short description pretty much covers it.
### END INIT INFO
. /lib/init/vars.sh
diff --git a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers.init b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers.init
index 80d6bfc..a0f7a29 100644
--- a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers.init
+++ b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers.init
@@ -10,6 +10,7 @@ set -e
# Default-Start: 0 6 X
# Default-Stop: S Y 0 6
# Short-Description: Do nothing at all
+# Description: The short description pretty much covers it.
### END INIT INFO
case "$1" in
diff --git a/t/tests/init.d-lsb-headers/desc b/t/tests/init.d-lsb-headers/desc
index 8bb44c4..4f5edcc 100644
--- a/t/tests/init.d-lsb-headers/desc
+++ b/t/tests/init.d-lsb-headers/desc
@@ -11,6 +11,8 @@ Test-For:
init.d-script-has-conflicting-start-stop
init.d-script-missing-dependency-on-remote_fs
init.d-script-missing-dependency-on-local_fs
+ init.d-script-missing-lsb-description
+ init.d-script-missing-lsb-short-description
init.d-script-missing-start
init.d-script-possible-missing-stop
init.d-script-provides-virtual-facility
diff --git a/t/tests/init.d-lsb-headers/tags b/t/tests/init.d-lsb-headers/tags
index 94ae572..dbd77fd 100644
--- a/t/tests/init.d-lsb-headers/tags
+++ b/t/tests/init.d-lsb-headers/tags
@@ -9,6 +9,8 @@ E: init.d-lsb-headers: init.d-script-should-depend-on-virtual-facility etc/init.
E: init.d-lsb-headers: init.d-script-should-depend-on-virtual-facility etc/init.d/init.d-lsb-headers sysklogd -> $syslog
E: init.d-lsb-headers: init.d-script-starts-in-stop-runlevel etc/init.d/init.d-lsb-headers 0
E: init.d-lsb-headers: init.d-script-starts-in-stop-runlevel etc/init.d/init.d-lsb-headers 6
+I: init.d-lsb-headers-missing: init.d-script-missing-lsb-description etc/init.d/init.d-lsb-headers-missing
+I: init.d-lsb-headers-missing: init.d-script-missing-lsb-short-description etc/init.d/init.d-lsb-headers-missing
I: init.d-lsb-headers: init.d-script-does-not-provide-itself etc/init.d/init.d-lsb-headers
W: init.d-lsb-headers-missing: init.d-script-missing-start etc/init.d/init.d-lsb-headers-missing 4
W: init.d-lsb-headers-missing: init.d-script-possible-missing-stop etc/init.d/init.d-lsb-headers-missing 1
--
Debian package checker
Reply to: