[Initscripts-ng-commits] r1013 - in /trunk/src/insserv/debian: changelog check-initd-order

[pere at users.alioth.debian.org]

Author: pere
Date: Wed Sep 23 21:06:55 2009
New Revision: 1013

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=1013
Log:
Make check-initd-order report missing provides header as errors
instead of printing perl warnings.

Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/check-initd-order

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=1013&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Wed Sep 23 21:06:55 2009
@@ -5,6 +5,8 @@
   * New patch 82_loop_exit_msg.patch to make exit message when a loop
     is detected loop more like the exit messages when other problems
     are detected.
+  * Make check-initd-order report missing provides header as errors
+    instead of printing perl warnings.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sun, 20 Sep 2009 22:05:40 +0200
 

Modified: trunk/src/insserv/debian/check-initd-order
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/check-initd-order?rev=1013&op=diff
==============================================================================
--- trunk/src/insserv/debian/check-initd-order (original)
+++ trunk/src/insserv/debian/check-initd-order Wed Sep 23 21:06:55 2009
@@ -292,7 +292,8 @@
             my $lsbinforef = load_lsb_tags($scriptpath,
                                            $useoverrides);
 
-            if (exists $lsbinforef->{'provides'}) {
+            if (exists $lsbinforef->{'provides'}
+                && $lsbinforef->{'provides'}) {
                 for my $provide (split(/\s+/, $lsbinforef->{'provides'})) {
                     $provideslist{$provide} = $order;
                 }
@@ -323,10 +324,14 @@
         }
         my %lsbinfo = %{$lsbinforef};
 
-        for my $provide (split(/\s+/, $lsbinfo{'provides'})) {
-            $scriptorder{$tag}{$provide} = $bootorder;
-            $scriptorder{$tag}{$sysmap{$provide}} = $bootorder
-                if (exists $sysmap{$provide});
+        if (exists $lsbinfo{'provides'} && $lsbinfo{'provides'}) {
+            for my $provide (split(/\s+/, $lsbinfo{'provides'})) {
+                $scriptorder{$tag}{$provide} = $bootorder;
+                $scriptorder{$tag}{$sysmap{$provide}} = $bootorder
+                    if (exists $sysmap{$provide});
+            }
+        } else {
+            error "no LSB header provides value in script $scriptpath\n";
         }
 
         if ('S' eq $tag) {