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

[pere at users.alioth.debian.org]

Author: pere
Date: Wed Sep 16 14:36:11 2009
New Revision: 1004

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=1004
Log:
Use more standardized output for easier postprocessing.

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=1004&op=diff
==============================================================================
--- trunk/src/insserv/debian/check-archive-initd-scripts (original)
+++ trunk/src/insserv/debian/check-archive-initd-scripts Wed Sep 16 14:36:11 2009
@@ -28,7 +28,7 @@
 my $optheaders = "x-start-before|x-stop-after|should-start|should-stop";
 
 for my $virt (@virts) {
-    $provides{$virt} = ['/etc/insserv.conf'];
+    $provides{$virt} = ['insserv/etc/insserv.conf'];
 }
 
 # Ignore obsolete scripts, as these are unlikely to cause problems.
@@ -59,8 +59,9 @@
         my %script;
         map { $script{basename($_)} = 1; } @{$provides{$provide}};
         if (1 < scalar keys %script) {
-            error("duplicate provide '$provide' in scripts "
-                  . join(" ", short_name(@{$provides{$provide}})));
+            error(sprintf("scripts %s provide duplicate '%s'",
+                          join(",", short_name(@{$provides{$provide}})),
+                          $provide));
         }
     }
 }
@@ -155,7 +156,7 @@
     my $short = short_name($initdscript);
     my %lsbinfo;
     unless (open(INIT, "<", $initdscript)) {
-        error("unable to read $short");
+        error("script $short is unreadable");
         return ();
     }
     my $inheader = 0;