[Initscripts-ng-commits] r1026 - /trunk/src/insserv/debian/check-archive-initd-scripts

[pere at users.alioth.debian.org]

Author: pere
Date: Mon Sep 28 18:15:15 2009
New Revision: 1026

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=1026
Log:
Accept more stop runlevel configurations, and report the unusual start and stop runlevels.

Modified:
    trunk/src/insserv/debian/check-archive-initd-scripts

Modified: trunk/src/insserv/debian/check-archive-initd-scripts
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/check-archive-initd-scripts?rev=1026&op=diff
==============================================================================
--- trunk/src/insserv/debian/check-archive-initd-scripts (original)
+++ trunk/src/insserv/debian/check-archive-initd-scripts Mon Sep 28 18:15:15 2009
@@ -143,13 +143,20 @@
         if (!array_equal(['2', '3', '4', '5'], \@startrl) &&
             !array_equal(['s'], \@startrl) &&
             (!array_equal([], \@startrl) && @stoprl)) {
-            warning("script $short does not start in the usual runlevels");
-        }
-        # And most scripts stop in runlevel 1 or runlevels 0, 1 and 6
+            warning("script $short does not start in the usual runlevels: ",
+                    join(" ", @startrl));
+        }
+
+        # And most scripts stop in runlevel (1) runlevels (0, 1, 6),
+        # only starts or only stops in (0) or (6).
         if (!array_equal(['0', '1', '6'], \@stoprl) &&
             !array_equal(['1'], \@stoprl) &&
-            (!array_equal([], \@stoprl) && @startrl)) {
-            warning("script $short does not stop in the usual runlevels");
+            !array_equal(['0', '6'], \@stoprl) &&
+            !(array_equal(['0'], \@stoprl) && !@startrl) &&
+            !(array_equal(['6'], \@stoprl) && !@startrl) &&
+            !(array_equal([], \@stoprl) && @startrl)) {
+            warning("script $short does not stop in the usual runlevels: ",
+                    join(" ", @stoprl));
         }
     }
 }