[Pkg-samba-maint] r1649 - trunk/samba/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2007-11-29 08:46:13 +0000 (Thu, 29 Nov 2007)
New Revision: 1649

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/samba.init
Log:
* debian/samba.init: call log_progress_msg separately for each daemon on
  stop rather than passing a second arg to log_daemon_msg, for greater
  compatibility with both Debian and Ubuntu LSB initscript implementations.
  Closes: #453350.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2007-11-28 21:52:00 UTC (rev 1648)
+++ trunk/samba/debian/changelog	2007-11-29 08:46:13 UTC (rev 1649)
@@ -12,8 +12,12 @@
     LP: #29413
   * debian/panic-action: detect when we're on an Ubuntu system and direct bug
     reporters to Launchpad instead of to the Debian BTS.  Closes: #452940.
+  * debian/samba.init: call log_progress_msg separately for each daemon on
+    stop rather than passing a second arg to log_daemon_msg, for greater
+    compatibility with both Debian and Ubuntu LSB initscript implementations.
+    Closes: #453350.
 
- -- Steve Langasek <vorlon at debian.org>  Mon, 26 Nov 2007 23:52:08 -0800
+ -- Steve Langasek <vorlon at debian.org>  Thu, 29 Nov 2007 00:40:38 -0800
 
 samba (3.0.27a-1) unstable; urgency=low
 

Modified: trunk/samba/debian/samba.init
===================================================================
--- trunk/samba/debian/samba.init	2007-11-28 21:52:00 UTC (rev 1648)
+++ trunk/samba/debian/samba.init	2007-11-29 08:46:13 UTC (rev 1649)
@@ -55,7 +55,8 @@
 		log_end_msg 0
 		;;
 	stop)
-		log_daemon_msg "Stopping Samba daemons" "nmbd"
+		log_daemon_msg "Stopping Samba daemons"
+		log_progress_msg "nmbd"
 
 		start-stop-daemon --stop --quiet --pidfile $NMBDPID
 		# Wait a little and remove stale PID file