[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/2.6.3-1-10-gcae5340

[Micah Anderson]

The following commit has been merged in the master branch:
commit 68b354433b227eb24f8ffbf63f29b38c2b577268
Author: Micah Anderson <micah at riseup.net>
Date:   Thu Dec 2 19:07:54 2010 -0500

    fix #605512 by removing the PID file in the initscript during stop

diff --git a/debian/changelog b/debian/changelog
index d5f78fd..9fc28b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 puppet (2.6.3-2) UNRELEASED; urgency=low
 
+  * Remove the puppetqd PID file on stop (Closes: #605512)
   * Add ext/puppetstoredconfigclean to puppetmaster:/usr/sbin
   * Patch ext/logcheck/puppet to handle new puppet-master 
     Compiled log lines (Closes: #602336)
diff --git a/debian/puppetmaster-common.puppetqd.init b/debian/puppetmaster-common.puppetqd.init
index e53518a..9cc7f7f 100644
--- a/debian/puppetmaster-common.puppetqd.init
+++ b/debian/puppetmaster-common.puppetqd.init
@@ -43,6 +43,7 @@ start_puppet_queue() {
 
 stop_puppet_queue() {
     start-stop-daemon --stop --quiet --oknodo --pidfile ${PIDFILE}
+    rm -f ${PIDFILE}
 }
 
 status_puppet_queue() {

-- 
Puppet packaging for Debian