[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 01/01: c/init.d: Drop check for long lsb description



This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository lintian.

commit ccada0b08a0aff59e6bcdcba08bb0da001486cc6
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Jun 19 13:11:35 2016 +0000

    c/init.d: Drop check for long lsb description
    
    Signed-off-by: Niels Thykier <niels@thykier.net>
---
 checks/init.d.desc              | 9 ---------
 checks/init.d.pm                | 2 +-
 debian/changelog                | 4 +++-
 t/tests/init.d-lsb-headers/desc | 1 -
 t/tests/init.d-lsb-headers/tags | 1 -
 5 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/checks/init.d.desc b/checks/init.d.desc
index ec8b8a9..ce33ba5 100644
--- a/checks/init.d.desc
+++ b/checks/init.d.desc
@@ -181,15 +181,6 @@ 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: https://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/checks/init.d.pm b/checks/init.d.pm
index 15f08c2..f91afa1 100644
--- a/checks/init.d.pm
+++ b/checks/init.d.pm
@@ -334,7 +334,7 @@ sub check_init {
                     tag 'init.d-script-missing-lsb-short-description',
                       $initd_path;
                 } elsif ($keyword eq 'description') {
-                    tag 'init.d-script-missing-lsb-description',$initd_path;
+                    next;
                 } else {
                     tag 'init.d-script-missing-lsb-keyword',
                       $initd_path, $keyword;
diff --git a/debian/changelog b/debian/changelog
index a0c8d6b..08eef9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,8 +27,10 @@ lintian (2.5.45) UNRELEASED; urgency=medium
       processing multiple debs.  (Closes: #738444)
   * checks/info-files.desc:
     + [NT] Use "gzip -9n" rather than "gzip -9" in examples.
-  * checks/init.d.desc:
+  * checks/init.d.{desc,pm}:
     + [JW] Fix typo.
+    + [NT] Remove tag for missing long LSB description in init scripts.
+      Thanks to Vincent Bernat for the report.  (Closes: #825193)
   * checks/manpages.desc:
     + [NT] Use "gzip -9n" rather than "gzip -9" in examples.
   * checks/scripts.{desc,pm}:
diff --git a/t/tests/init.d-lsb-headers/desc b/t/tests/init.d-lsb-headers/desc
index 19804e9..3bce2e2 100644
--- a/t/tests/init.d-lsb-headers/desc
+++ b/t/tests/init.d-lsb-headers/desc
@@ -12,7 +12,6 @@ Test-For:
  init.d-script-has-duplicate-lsb-keyword
  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
diff --git a/t/tests/init.d-lsb-headers/tags b/t/tests/init.d-lsb-headers/tags
index 1f8ba3e..3119a22 100644
--- a/t/tests/init.d-lsb-headers/tags
+++ b/t/tests/init.d-lsb-headers/tags
@@ -13,7 +13,6 @@ 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: