[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.25.4-2-6-g5fe60bc

[Micah Anderson]

The following commit has been merged in the master branch:
commit 5fe60bc5954fe65bcec713e5c9374672105a6381
Author: Micah Anderson <micah at riseup.net>
Date:   Mon Mar 22 11:57:47 2010 -0400

    fix for 574677- init stop action failing if puppetmaster is already stopped

diff --git a/debian/changelog b/debian/changelog
index 311558c..21c02ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ puppet (0.25.4-4) UNRELEASED; urgency=low
   * Provide an example apache2.conf for libapache2-mod-passenger
   * Ship the rack config.ru, and README as README.rack
   * Fix puppet-el.emacsen-startup script to be properly installed
+  * debian/puppetmaster.init: Fix init stop action to not fail if the
+    puppetmaster is already stopped, Thanks Mathias Gug (Closes: #574677)
 
  -- Micah Anderson <micah at debian.org>  Tue, 16 Mar 2010 12:27:07 -0400
 
diff --git a/debian/puppetmaster.init b/debian/puppetmaster.init
index 1e43848..1d9682b 100644
--- a/debian/puppetmaster.init
+++ b/debian/puppetmaster.init
@@ -62,13 +62,13 @@ stop_puppetmaster() {
 	NUMSTART=0
 	STOPPORT=$PORT
 	while [ $NUMSTART -lt $PUPPETMASTERS ]; do 
-	    start-stop-daemon --stop --quiet --pidfile /var/run/puppet/${NAME}-${STOPPORT}.pid
+	    start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/puppet/${NAME}-${STOPPORT}.pid
 	    rm -f /var/run/puppet/${NAME}-${STOPPORT}.pid
 	    STOPPORT=$(($STOPPORT + 1))
 	    NUMSTART=$(($NUMSTART + 1))
 	done
     else
-	start-stop-daemon --stop --quiet --pidfile /var/run/puppet/${NAME}.pid
+	start-stop-daemon --stop --quiet oknodo --pidfile /var/run/puppet/${NAME}.pid
     fi
 }
 

-- 
Puppet packaging for Debian