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

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 54a2a353d9c211346bea1292437ad16844b78817
Author: Andrew Pollock <apollock at debian.org>
Date:   Sat Apr 17 20:33:54 2010 -0700

    Fix invocation of start-stop-daemon for bug #578066

diff --git a/debian/changelog b/debian/changelog
index 10aa479..7844766 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+puppet (0.25.4-5) unstable; urgency=low
+
+  * debian/puppetmaster.init: fix invocation of start-stop-daemon (closes:
+  * #578066)
+
+ -- Andrew Pollock <apollock at debian.org>  Sat, 17 Apr 2010 20:33:09 -0700
+
 puppet (0.25.4-4) unstable; urgency=low
 
   [ Andrew Pollock ]
diff --git a/debian/puppetmaster.init b/debian/puppetmaster.init
index 3f48835..cfe014c 100644
--- a/debian/puppetmaster.init
+++ b/debian/puppetmaster.init
@@ -68,7 +68,7 @@ stop_puppetmaster() {
 	    NUMSTART=$(($NUMSTART + 1))
 	done
     else
-	start-stop-daemon --stop --quiet oknodo --pidfile /var/run/puppet/${NAME}.pid
+	start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/puppet/${NAME}.pid
     fi
 }
 

-- 
Puppet packaging for Debian