summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-06-20 18:38:48 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-06-20 18:38:48 +0000
commitf9a4d7addd7e31e6b868cbbf3cc87ffbfea781e3 (patch)
tree786110eac83c0ec989581e5db566e224d5705c7c /lib
parentd812840a89092ccd04c2ad81a3bd80a6cc2f7882 (diff)
downloadpuppet-f9a4d7addd7e31e6b868cbbf3cc87ffbfea781e3.tar.gz
puppet-f9a4d7addd7e31e6b868cbbf3cc87ffbfea781e3.tar.xz
puppet-f9a4d7addd7e31e6b868cbbf3cc87ffbfea781e3.zip
Fixing #175. The setpidfile setting was being ignored.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1306 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
-rwxr-xr-xlib/puppet/daemon.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/puppet/daemon.rb b/lib/puppet/daemon.rb
index 508c79efa..edcd5f50d 100755
--- a/lib/puppet/daemon.rb
+++ b/lib/puppet/daemon.rb
@@ -216,6 +216,7 @@ module Puppet
# Create the pid file.
def setpidfile
+ return unless Puppet[:setpidfile]
Puppet.config.use(:puppet)
@pidfile = self.pidfile
if FileTest.exists?(@pidfile)