[Pkg-sysvinit-commits] r1319 - in sysvinit/trunk/debian: . sysv-rc/sbin

[kelmo-guest at alioth.debian.org]

Author: kelmo-guest
Date: 2009-02-02 14:13:18 +0000 (Mon, 02 Feb 2009)
New Revision: 1319

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d
Log:
When update-rc.d in "start|stop"-mode is invoked without the final
dot, script warnings are displayed just before the "usage" message
is shown. Check that last argument to start|stop command is a period
earlier. Thanks to Patrick <pet at painfullscratch.nl>.  Closes: #512003
LP: #312764

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-02-02 14:11:15 UTC (rev 1318)
+++ sysvinit/trunk/debian/changelog	2009-02-02 14:13:18 UTC (rev 1319)
@@ -31,8 +31,13 @@
     the global script argument array.
   * Add interface for disabling system init script start links with
     update-rc.d, and enabling them again. Closes: #67095
+  * When update-rc.d in "start|stop"-mode is invoked without the final
+    dot, script warnings are displayed just before the "usage" message
+    is shown. Check that last argument to start|stop command is a period
+    earlier. Thanks to Patrick <pet at painfullscratch.nl>.  Closes: #512003
+    LP: #312764
 
- -- Kel Modderman <kel at otaku42.de>  Tue, 03 Feb 2009 00:09:28 +1000
+ -- Kel Modderman <kel at otaku42.de>  Tue, 03 Feb 2009 00:12:30 +1000
 
 sysvinit (2.86.ds1-61) unstable; urgency=low
 

Modified: sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d
===================================================================
--- sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d	2009-02-02 14:11:15 UTC (rev 1318)
+++ sysvinit/trunk/debian/sysv-rc/sbin/update-rc.d	2009-02-02 14:13:18 UTC (rev 1319)
@@ -261,6 +261,10 @@
 	}
 	$NN = sprintf("%02d", $argv[1]);
 
+	if ($argv[-1] ne '.') {
+	    &usage("start|stop arguments not terminated by \".\"");
+	}
+
 	shift @argv; shift @argv;
 	$level = shift @argv;
 	do {
@@ -277,8 +281,6 @@
 	    $startlinks[$level] = "$letter$NN" if ($letter eq 'S');
 	    $stoplinks[$level]  = "$letter$NN" if ($letter eq 'K');
 	} while (($level = shift @argv) ne '.');
-	&usage("action with list of runlevels not terminated by \`.'")
-	    if ($level ne '.');
     }
     1;
 }