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

[pere at users.alioth.debian.org]

Author: pere
Date: Wed Sep 16 13:43:22 2009
New Revision: 1003

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=1003
Log:
Missing hard dependencies are errors, missing soft dependencies are only warnings.

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=1003&op=diff
==============================================================================
--- trunk/src/insserv/debian/check-archive-initd-scripts (original)
+++ trunk/src/insserv/debian/check-archive-initd-scripts Wed Sep 16 13:43:22 2009
@@ -21,7 +21,8 @@
                $portmap $network $all
                $mail-transport-agent $x-font-server
                );
-my @depheaders = qw(required-start required-stop should-start
+my @harddepheaders = qw(required-start required-stop);
+my @softdepheaders = qw(should-start
                     should-stop x-start-before x-stop-after);
 my $lsbheaders = "Provides|Required-Start|Required-Stop|Default-Start|Default-Stop";
 my $optheaders = "x-start-before|x-stop-after|should-start|should-stop";
@@ -69,19 +70,32 @@
     next unless ($scriptinfo{$initdscript}->{'found'});
     my $short = short_name($initdscript);
     my %checked;
-    my @missing = ();
-    for my $header (@depheaders) {
+    my @hardmissing = ();
+    for my $header (@harddepheaders) {
         my $list = $scriptinfo{$initdscript}->{$header};
         next unless defined $list;
         for my $facility (split(/[ ,\t]+/, $list)) {
             next if exists $checked{$facility};
             $checked{$facility} = 1;
-            push(@missing, $facility)
+            push(@hardmissing, $facility)
                 unless exists $provides{$facility};
         }
     }
-    error("script $short relate to non-existing provides: "
-          . join(" ", @missing)) if (@missing);
+    error("script $short depend on non-existing provides: "
+          . join(" ", @hardmissing)) if (@hardmissing);
+    my @softmissing = ();
+    for my $header (@softdepheaders) {
+        my $list = $scriptinfo{$initdscript}->{$header};
+        next unless defined $list;
+        for my $facility (split(/[ ,\t]+/, $list)) {
+            next if exists $checked{$facility};
+            $checked{$facility} = 1;
+            push(@softmissing, $facility)
+                unless exists $provides{$facility};
+        }
+    }
+    warning("script $short relate to non-existing provides: "
+            . join(" ", @softmissing)) if (@softmissing);
 
     if (exists $checked{'$syslog'}
         && $scriptinfo{$initdscript}->{'default-start'} =~ m/s/i) {