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

[lintian] 01/01: Also check for "RUN=" and "DAEMONRUN=" when evalating lines in /etc/default for "init.d-script-should-always-start-service" violations. Thanks to Laurent Bigonville. (Closes: #890916)



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

lamby pushed a commit to branch master
in repository lintian.

commit d082b72f9ef027c31eea7956339540ec97155db8
Author: Chris Lamb <lamby@debian.org>
Date:   Tue Feb 20 23:02:24 2018 +0000

    Also check for "RUN=" and "DAEMONRUN=" when evalating lines in /etc/default for "init.d-script-should-always-start-service" violations. Thanks to Laurent Bigonville. (Closes: #890916)
---
 checks/init.d.desc                                          |  2 +-
 checks/init.d.pm                                            |  2 +-
 debian/changelog                                            |  4 ++++
 t/tests/init.d-general/debian/debian/init.d-general.default |  8 ++++++++
 t/tests/init.d-general/tags                                 | 10 +++++++++-
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/checks/init.d.desc b/checks/init.d.desc
index 418a29f..3f083ad 100644
--- a/checks/init.d.desc
+++ b/checks/init.d.desc
@@ -375,7 +375,7 @@ Tag: init.d-script-should-always-start-service
 Severity: important
 Certainty: possible
 Info: The specified file under <tt>/etc/default/</tt> includes a line
- such as <tt>ENABLED=</tt> or <tt>DISABLED=</tt>.
+ such as <tt>ENABLED=</tt>, <tt>DISABLED=</tt>, <tt>RUN=</tt>, etc.
  .
  This is an older practice used so that the package's init script would
  not start the service until the local system administrator changed this
diff --git a/checks/init.d.pm b/checks/init.d.pm
index d8d05f1..d10db06 100644
--- a/checks/init.d.pm
+++ b/checks/init.d.pm
@@ -494,7 +494,7 @@ sub check_defaults {
         my $fd = $path->open;
         while (<$fd>) {
             tag 'init.d-script-should-always-start-service', $path, "(line $.)"
-              if m/^\s*#*\s*(?:ENABLED|DISABLED)=/;
+              if m/^\s*#*\s*(?:ENABLED|DISABLED|[A-Z]*RUN)=/;
         }
         close($fd);
     }
diff --git a/debian/changelog b/debian/changelog
index 9fa729b..ae3831d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,10 @@ lintian (2.5.76) UNRELEASED; urgency=medium
     + [CL] Correct a grammatical error and tighten up the language of the
       "binary-package-depends-on-toolchain-package" tag's description.
       Thanks to Gregor Herrmann for the report.  (Closes: #890530)
+  * checks/init.d.pm:
+    + [CL] Also check for "RUN=" and "DAEMONRUN=" when evalating lines in
+      /etc/default for "init.d-script-should-always-start-service"
+      violations. Thanks to Laurent Bigonville.  (Closes: #890916)
   * checks/rules.{desc,pm}:
     + [CL] Update override_dh_auto_test-does-not-check-DEB_BUILD_OPTIONS
       to fix a number of false positives. Thanks to Gregor Herrmann for
diff --git a/t/tests/init.d-general/debian/debian/init.d-general.default b/t/tests/init.d-general/debian/debian/init.d-general.default
index 9389211..c1d7f21 100644
--- a/t/tests/init.d-general/debian/debian/init.d-general.default
+++ b/t/tests/init.d-general/debian/debian/init.d-general.default
@@ -2,8 +2,16 @@ ENABLED="false"
 ENABLED=false
 DISABLED="true"
 DISABLED=true
+RUN="true"
+RUN=true
+PREFIXRUN="true"
+PREFIXRUN=true
 
 # ENABLED="false"
 # ENABLED=false
 # DISABLED="true"
 # DISABLED=true
+# RUN="true"
+# RUN=true
+# PREFIXRUN="true"
+# PREFIXRUN=true
diff --git a/t/tests/init.d-general/tags b/t/tests/init.d-general/tags
index ea37904..bcc8b75 100644
--- a/t/tests/init.d-general/tags
+++ b/t/tests/init.d-general/tags
@@ -5,13 +5,21 @@ 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 stop
 E: init.d-general-sourcing-without-test: init.d-script-sourcing-without-test etc/init.d/init.d-general-sourcing-without-test:17 /etc/default/rcS
 E: init.d-general: init.d-script-should-always-start-service etc/default/init.d-general (line 1)
+E: init.d-general: init.d-script-should-always-start-service etc/default/init.d-general (line 10)
+E: init.d-general: init.d-script-should-always-start-service etc/default/init.d-general (line 11)
+E: init.d-general: init.d-script-should-always-start-service etc/default/init.d-general (line 12)
+E: init.d-general: init.d-script-should-always-start-service etc/default/init.d-general (line 13)
+E: init.d-general: init.d-script-should-always-start-service etc/default/init.d-general (line 14)
+E: init.d-general: init.d-script-should-always-start-service etc/default/init.d-general (line 15)
+E: init.d-general: init.d-script-should-always-start-service etc/default/init.d-general (line 16)
+E: init.d-general: init.d-script-should-always-start-service etc/default/init.d-general (line 17)
 E: init.d-general: init.d-script-should-always-start-service etc/default/init.d-general (line 2)
 E: init.d-general: init.d-script-should-always-start-service etc/default/init.d-general (line 3)
 E: init.d-general: init.d-script-should-always-start-service etc/default/init.d-general (line 4)
+E: init.d-general: init.d-script-should-always-start-service etc/default/init.d-general (line 5)
 E: init.d-general: init.d-script-should-always-start-service etc/default/init.d-general (line 6)
 E: init.d-general: init.d-script-should-always-start-service etc/default/init.d-general (line 7)
 E: init.d-general: init.d-script-should-always-start-service etc/default/init.d-general (line 8)
-E: init.d-general: init.d-script-should-always-start-service etc/default/init.d-general (line 9)
 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-does-not-source-init-functions etc/init.d/init.d-general-interpreter-in-usr-dir
 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

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


Reply to: